Merged stone_soup r15:451 into trunk.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@452 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 1193 insertions, 614 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 8580b8758b..47f443f951 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -1,6 +1,12 @@
+/*
+ *  Modified for Crawl Reference by $Author$ on $Date$
+ */
+
 #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,7 +110,8 @@
 {
     MONS_PROGRAM_BUG, 'B', LIGHTRED, "program bug",
     M_NO_EXP_GAIN,
-    0, 10, MONS_PROGRAM_BUG, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 10, MONS_PROGRAM_BUG, MONS_PROGRAM_BUG, MH_NATURAL, -3,
     { 0, 0, 0, 0 },
     { 0, 0, 0, 0 },
     0, 0, 0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -115,8 +122,9 @@
 // real monsters begin here {dlb}:
 {
     MONS_GIANT_ANT, 'a', DARKGREY, "giant ant",
-    M_ED_POISON,
-    700, 10, MONS_GIANT_ANT, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    700, 10, MONS_GIANT_ANT, MONS_GIANT_ANT, MH_NATURAL, -3,
     { 8, 0, 0, 0 },
     { 3, 3, 5, 0 },
     4, 10, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
@@ -127,7 +135,8 @@
 {
     MONS_GIANT_BAT, 'b', DARKGREY, "giant bat",
     M_FLIES | M_SEE_INVIS | M_WARM_BLOOD,
-    150, 4, MONS_GIANT_BAT, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    150, 4, MONS_GIANT_BAT, MONS_GIANT_BAT, MH_NATURAL, -1,
     { 1, 0, 0, 0 },
     { 1, 2, 3, 0 },
     1, 14, 30, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -138,7 +147,8 @@
 {
     MONS_CENTAUR, 'c', BROWN, "centaur",
     M_WARM_BLOOD,
-    1500, 10, MONS_CENTAUR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1500, 10, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 4, 3, 5, 0 },
     3, 7, 15, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -148,8 +158,9 @@
 
 {
     MONS_RED_DEVIL, '4', RED, "red devil",
-    M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_FLIES,
-    0, 10, MONS_RED_DEVIL, MH_DEMONIC, -7,
+    M_FLIES | M_EVIL,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 10, MONS_RED_DEVIL, MONS_RED_DEVIL, MH_DEMONIC, -7,
     { 18, 0, 0, 0 },
     { 5, 3, 5, 0 },
     10, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -159,8 +170,9 @@
 
 {
     MONS_ETTIN, 'C', BROWN, "ettin",
-    M_WARM_BLOOD,
-    0, 10, MONS_ETTIN, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_HILL_GIANT, MONS_ETTIN, MH_NATURAL, -3,
     { 18, 12, 0, 0 },
     { 7, 3, 5, 0 },
     3, 4, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT2, I_NORMAL, 
@@ -170,8 +182,9 @@
 
 {
     MONS_FUNGUS, 'f', LIGHTGREY, "fungus",
-    M_NO_EXP_GAIN | M_RES_POISON,
-    0, 10, MONS_FUNGUS, MH_PLANT, 5000,
+    M_NO_EXP_GAIN,
+    MR_RES_POISON,
+    0, 10, MONS_PLANT, MONS_FUNGUS, MH_PLANT, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 8, 3, 5, 0 },
     1, 0, 0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -181,8 +194,9 @@
 
 {
     MONS_GOBLIN, 'g', LIGHTGREY, "goblin",
-    M_WARM_BLOOD,
-    400, 10, MONS_GOBLIN, MH_NATURAL, -1,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    400, 10, MONS_GOBLIN, MONS_GOBLIN, MH_NATURAL, -1,
     { 4, 0, 0, 0 },
     { 1, 2, 4, 0 },
     0, 12, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -193,7 +207,8 @@
 {
     MONS_HOUND, 'h', BROWN, "hound",
     M_SEE_INVIS | M_WARM_BLOOD,
-    300, 10, MONS_HOUND, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    300, 10, MONS_HOUND, MONS_HOUND, MH_NATURAL, -3,
     { 6, 0, 0, 0 },
     { 3, 3, 5, 0 },
     2, 13, 15, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BARK, I_ANIMAL, 
@@ -204,8 +219,9 @@
 // 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,
-    0, 13, MONS_IMP, MH_DEMONIC, -9,
+    M_FLIES | M_SEE_INVIS | M_SPEAKS | M_EVIL | M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 13, MONS_IMP, MONS_IMP, MH_DEMONIC, -9,
     { 4, 0, 0, 0 },
     { 3, 3, 3, 0 },
     3, 14, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -216,7 +232,8 @@
 {
     MONS_JACKAL, 'j', YELLOW, "jackal",
     M_WARM_BLOOD,
-    200, 10, MONS_JACKAL, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    200, 10, MONS_HOUND, MONS_JACKAL, MH_NATURAL, -1,
     { 3, 0, 0, 0 },
     { 1, 3, 5, 0 },
     2, 12, 14, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, I_ANIMAL, 
@@ -226,8 +243,9 @@
 
 {
     MONS_KILLER_BEE, 'k', YELLOW, "killer bee",
-    M_ED_POISON | M_FLIES,
-    150, 11, MONS_KILLER_BEE, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    150, 11, MONS_KILLER_BEE, MONS_KILLER_BEE, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 3, 3, 5, 0 },
     2, 18, 20, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_BUZZ, I_INSECT, 
@@ -237,8 +255,9 @@
 
 {
     MONS_KILLER_BEE_LARVA, 'w', LIGHTGREY, "killer bee larva",
-    M_ED_POISON | M_NO_SKELETON,
-    150, 5, MONS_KILLER_BEE_LARVA, MH_NATURAL, -3,
+    M_NO_SKELETON,
+    MR_VUL_POISON,
+    150, 5, MONS_KILLER_BEE_LARVA, MONS_KILLER_BEE_LARVA, MH_NATURAL, -3,
     { 3, 0, 0, 0 },
     { 1, 3, 5, 0 },
     1, 5, 5, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -248,8 +267,9 @@
 
 {
     MONS_MANTICORE, 'm', BROWN, "manticore",
-    M_WARM_BLOOD,
-    1800, 10, MONS_MANTICORE, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_SPECIAL_ABILITY,
+    MR_NO_FLAGS,
+    1800, 10, MONS_MANTICORE, MONS_MANTICORE, MH_NATURAL, -3,
     { 14, 8, 8, 0 },
     { 9, 3, 5, 0 },
     5, 7, 7, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_NORMAL, 
@@ -260,8 +280,9 @@
 // this thing doesn't have nr. 13 for nothing, has it? ($pellbinder)
 {
     MONS_NECROPHAGE, 'n', DARKGREY, "necrophage",
-    M_RES_POISON | M_RES_COLD,
-    500, 10, MONS_NECROPHAGE, MH_UNDEAD, -5,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    500, 10, MONS_GHOUL, MONS_NECROPHAGE, MH_UNDEAD, -5,
     { 8, 0, 0, 0 },
     { 5, 3, 5, 0 },
     2, 10, 10, 7, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -271,8 +292,9 @@
 
 {
     MONS_ORC, 'o', LIGHTRED, "orc",
-    M_WARM_BLOOD,
-    600, 10, MONS_ORC, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    600, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 1, 4, 6, 0 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -284,8 +306,9 @@
 // dangerous, but still come out at 200+ XP
 {
     MONS_PHANTOM, 'p', BLUE, "phantom",
-    M_RES_POISON | M_RES_COLD,
-    0, 5, MONS_PHANTOM, MH_UNDEAD, -4,
+    M_EVIL | M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 5, MONS_PHANTOM, MONS_PHANTOM, MH_UNDEAD, -4,
     { 10, 0, 0, 0 },
     { 7, 3, 5, 0 },
     3, 13, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -295,8 +318,9 @@
 
 {
     MONS_QUASIT, 'q', LIGHTGREY, "quasit",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD,
-    0, 10, MONS_QUASIT, MH_DEMONIC, 50,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
+    0, 10, MONS_QUASIT, MONS_QUASIT, MH_DEMONIC, 50,
     { 3, 2, 2, 0 },
     { 3, 2, 6, 0 },
     5, 17, 15, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_INSECT, 
@@ -307,7 +331,8 @@
 {
     MONS_RAT, 'r', BROWN, "rat",
     M_WARM_BLOOD,
-    200, 10, MONS_RAT, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    200, 10, MONS_RAT, MONS_RAT, MH_NATURAL, -1,
     { 3, 0, 0, 0 },
     { 1, 1, 3, 0 },
     1, 10, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -317,8 +342,9 @@
 
 {
     MONS_SCORPION, 's', DARKGREY, "scorpion",
-    M_ED_POISON,
-    500, 10, MONS_SCORPION, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    500, 10, MONS_SCORPION, MONS_SCORPION, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 3, 3, 5, 0 },
     5, 10, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -331,8 +357,9 @@
 // not until it can be reimplemented safely {dlb}
 {
     MONS_TUNNELING_WORM, 't', LIGHTRED, "tunneling worm",
-    M_RES_POISON,
-    0, 10, 19, MH_NATURAL, 5000,
+    M_NO_FLAGS,
+    MR_RES_POISON,
+    0, 10, 19, MH_NATURAL, MAG_IMMUNE,
     { 50, 0, 0, 0 },
     { 10, 5, 5, 0 },
     3, 3, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_REPTILE, 
@@ -344,7 +371,8 @@
 {
     MONS_UGLY_THING, 'u', BROWN, "ugly thing",
     M_WARM_BLOOD | M_AMPHIBIOUS,
-    600, 10, MONS_UGLY_THING, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    600, 10, MONS_UGLY_THING, MONS_UGLY_THING, MH_NATURAL, -3,
     { 12, 0, 0, 0 },
     { 8, 3, 5, 0 },
     3, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -354,8 +382,9 @@
 
 {
     MONS_FIRE_VORTEX, 'v', RED, "fire vortex",
-    M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_RES_ELEC | M_LEVITATE | M_CONFUSED,
-    0, 5, MONS_FIRE_VORTEX, MH_NONLIVING, 5000,
+    M_LEVITATE | M_CONFUSED,
+    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD | MR_RES_ELEC,
+    0, 5, MONS_FIRE_VORTEX, MONS_FIRE_VORTEX, MH_NONLIVING, MAG_IMMUNE,
     { 30, 0, 0, 0 },
     { 3, 3, 5, 0 },
     0, 5, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -366,7 +395,8 @@
 {
     MONS_WORM, 'w', LIGHTRED, "worm",
     M_NO_SKELETON,
-    350, 4, MONS_WORM, MH_NATURAL, -2,
+    MR_NO_FLAGS,
+    350, 4, MONS_WORM, MONS_WORM, MH_NATURAL, -2,
     { 12, 0, 0, 0 },
     { 5, 3, 5, 0 },
     1, 5, 6, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
@@ -377,8 +407,9 @@
 // random
 {
     MONS_ABOMINATION_SMALL, 'x', BLACK, "abomination",
-    M_NO_FLAGS,
-    0, 10, MONS_ABOMINATION_SMALL, MH_DEMONIC, -5,
+    M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_ABOMINATION_SMALL, MONS_ABOMINATION_SMALL, MH_DEMONIC, -5,
     { 23, 0, 0, 0 },
     { 6, 2, 5, 0 },
     0, 0, 0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -388,8 +419,9 @@
 
 {
     MONS_YELLOW_WASP, 'y', YELLOW, "yellow wasp",
-    M_ED_POISON | M_FLIES,
-    220, 12, MONS_YELLOW_WASP, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    220, 12, MONS_YELLOW_WASP, MONS_YELLOW_WASP, MH_NATURAL, -3,
     { 13, 0, 0, 0 },
     { 4, 3, 5, 0 },
     5, 14, 15, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_INSECT, 
@@ -400,8 +432,9 @@
 // small zombie
 {
     MONS_ZOMBIE_SMALL, 'z', BROWN, "",
-    M_RES_POISON | M_RES_COLD,
-    0, 6, MONS_ZOMBIE_SMALL, MH_UNDEAD, -1,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 6, MONS_ZOMBIE_SMALL, MONS_ZOMBIE_SMALL, MH_UNDEAD, -1,
     { 10, 0, 0, 0 },
     { 1, 5, 5, 0 },
     0, 4, 5, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -411,8 +444,9 @@
 
 {
     MONS_ANGEL, 'A', WHITE, "Angel",
-    M_RES_POISON | M_FLIES | M_RES_ELEC | M_SPELLCASTER,
-    0, 10, MONS_ANGEL, MH_HOLY, -8,
+    M_FLIES | M_SPELLCASTER,
+    MR_RES_POISON | MR_RES_ELEC,
+    0, 10, MONS_ANGEL, MONS_ANGEL, MH_HOLY, -8,
     { 20, 0, 0, 0 },
     { 9, 3, 5, 0 },
     10, 10, 10, 7, MST_ANGEL, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -422,8 +456,9 @@
 
 {
     MONS_GIANT_BEETLE, 'B', DARKGREY, "giant beetle",
-    M_ED_POISON,
-    1000, 10, MONS_GIANT_BEETLE, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    1000, 10, MONS_GIANT_BEETLE, MONS_GIANT_BEETLE, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 5, 7, 6, 0 },
     10, 3, 5, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -433,8 +468,9 @@
 
 {
     MONS_CYCLOPS, 'C', BROWN, "cyclops",
-    M_WARM_BLOOD,
-    2500, 10, MONS_CYCLOPS, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    2500, 10, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3,
     { 35, 0, 0, 0 },
     { 9, 3, 5, 0 },
     5, 3, 7, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -444,8 +480,9 @@
 
 {
     MONS_DRAGON, 'D', GREEN, "dragon",
-      M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_FLIES, //jmf: warm blood?
-    2200, 12, MONS_DRAGON, MH_NATURAL, -4,
+    M_FLIES | M_SPECIAL_ABILITY, //jmf: warm blood?
+    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD,
+    2200, 12, MONS_DRAGON, MONS_DRAGON, MH_NATURAL, -4,
     { 20, 13, 13, 0 },
     { 12, 5, 5, 0 },
     10, 8, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT, I_NORMAL, 
@@ -457,8 +494,9 @@
 // that they wield two weapons... I'm raising their xp modifier. -- bwr
 {
     MONS_TWO_HEADED_OGRE, 'O', LIGHTRED, "two-headed ogre",
-    M_WARM_BLOOD,
-    1500, 15, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    1500, 15, MONS_OGRE, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4,
     { 17, 13, 0, 0 },
     { 6, 3, 5, 0 },
     1, 4, 8, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT2, I_NORMAL, 
@@ -468,8 +506,9 @@
 
 {
     MONS_FIEND, '1', LIGHTRED, "Fiend", //jmf: was RED, like Balrog
-    M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_FLIES | M_SEE_INVIS,
-    0, 18, MONS_FIEND, MH_DEMONIC, -12,
+    M_FLIES | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 18, MONS_FIEND, MONS_FIEND, MH_DEMONIC, -12,
     { 25, 15, 15, 0 },
     { 18, 3, 5, 0 },
       15, 6, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -479,8 +518,9 @@
 
 {
     MONS_GIANT_SPORE, 'G', GREEN, "giant spore",
-    M_RES_POISON | M_LEVITATE,
-    0, 10, MONS_GIANT_SPORE, MH_NATURAL, -3,
+    M_LEVITATE,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 10, MONS_PLANT, MONS_GIANT_SPORE, MH_NATURAL, -3,
     { 1, 0, 0, 0 },
     { 1, 0, 0, 1 },
     0, 10, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -490,8 +530,9 @@
 
 {
     MONS_HOBGOBLIN, 'g', BROWN, "hobgoblin",
-    M_WARM_BLOOD,
-    500, 10, MONS_HOBGOBLIN, MH_NATURAL, -1,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    500, 10, MONS_GOBLIN, MONS_HOBGOBLIN, MH_NATURAL, -1,
     { 5, 0, 0, 0 },
     { 1, 4, 5, 0 },
     2, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -501,8 +542,9 @@
 
 {
     MONS_ICE_BEAST, 'I', WHITE, "ice beast",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD,
-    0, 12, MONS_ICE_BEAST, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_RES_POISON | MR_RES_ASPHYX | MR_VUL_FIRE | MR_RES_COLD,
+    0, 12, MONS_ICE_BEAST, MONS_ICE_BEAST, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 5, 3, 5, 0 },
     5, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL_LIKE, 
@@ -512,8 +554,9 @@
 
 {
     MONS_JELLY, 'J', LIGHTRED, "jelly",
-    M_RES_POISON | M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS,
-    0, 13, MONS_JELLY, MH_NATURAL, -3,
+    M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 13, MONS_JELLY, MONS_JELLY, MH_NATURAL, -3,
     { 8, 0, 0, 0 },
     { 3, 5, 5, 0 },
     0, 2, 9, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -524,7 +567,8 @@
 {
     MONS_KOBOLD, 'K', BROWN, "kobold",
     M_WARM_BLOOD,
-    400, 10, MONS_KOBOLD, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    400, 10, MONS_KOBOLD, MONS_KOBOLD, MH_NATURAL, -1,
     { 4, 0, 0, 0 },
     { 1, 2, 3, 0 },
     2, 12, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -534,8 +578,9 @@
 
 {
     MONS_LICH, 'L', WHITE, "lich",
-    M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS,
-    0, 16, MONS_LICH, MH_UNDEAD, -11,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
+    0, 16, MONS_LICH, MONS_LICH, MH_UNDEAD, -11,
     { 15, 0, 0, 0 },
     { 20, 2, 4, 0 },
     10, 10, 10, 7, MST_LICH_I, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -545,8 +590,9 @@
 
 {
     MONS_MUMMY, 'M', WHITE, "mummy",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD,
-    0, 10, MONS_MUMMY, MH_UNDEAD, -5,
+    M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 10, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, -5,
     { 20, 0, 0, 0 },
     { 3, 5, 3, 0 },
     3, 6, 6, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
@@ -556,8 +602,9 @@
 
 {
     MONS_GUARDIAN_NAGA, 'N', LIGHTGREEN, "guardian naga",
-    M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    350, 10, MONS_GUARDIAN_NAGA, MH_NATURAL, -6,
+    M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
+    MR_RES_POISON,
+    350, 10, MONS_NAGA, MONS_GUARDIAN_NAGA, MH_NATURAL, -6,
     { 19, 0, 0, 0 },
     { 8, 3, 5, 0 },
     6, 14, 15, 7, MST_GUARDIAN_NAGA, CE_MUTAGEN_RANDOM, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -567,8 +614,9 @@
 
 {
     MONS_OGRE, 'O', BROWN, "ogre",
-    M_WARM_BLOOD,
-    1300, 10, MONS_OGRE, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    1300, 10, MONS_OGRE, MONS_OGRE, MH_NATURAL, -3,
     { 17, 0, 0, 0 },
     { 5, 3, 5, 0 },
     1, 6, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -579,7 +627,8 @@
 {
     MONS_PLANT, 'P', GREEN, "plant",
     M_NO_EXP_GAIN,
-    0, 10, MONS_PLANT, MH_PLANT, 5000,
+    MR_NO_FLAGS,
+    0, 10, MONS_PLANT, MONS_PLANT, MH_PLANT, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 10, 3, 5, 0 },
     10, 0, 0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -589,8 +638,9 @@
 
 {
     MONS_QUEEN_BEE, 'Q', YELLOW, "queen bee",
-    M_ED_POISON | M_FLIES,
-    200, 14, MONS_QUEEN_BEE, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    200, 14, MONS_KILLER_BEE, MONS_QUEEN_BEE, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 7, 3, 5, 0 },
     10, 10, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -600,8 +650,9 @@
 
 {
     MONS_RAKSHASA, 'R', YELLOW, "rakshasa",
-    M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS,
-    0, 15, MONS_RAKSHASA, MH_NATURAL, -10,
+    M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON,
+    0, 15, MONS_RAKSHASA, MONS_RAKSHASA, MH_NATURAL, -10,
     { 20, 0, 0, 0 },
     { 10, 3, 5, 0 },
     10, 14, 10, 7, MST_RAKSHASA, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -612,7 +663,8 @@
 {
     MONS_SNAKE, 'S', GREEN, "snake",
     M_COLD_BLOOD | M_AMPHIBIOUS,
-    200, 10, MONS_SNAKE, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    200, 10, MONS_SNAKE, MONS_SNAKE, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 2, 3, 5, 0 },
     1, 15, 13, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_REPTILE, 
@@ -622,8 +674,9 @@
 
 {
     MONS_TROLL, 'T', BROWN, "troll",
-    M_WARM_BLOOD,
-    1500, 10, MONS_TROLL, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    1500, 10, MONS_TROLL, MONS_TROLL, MH_NATURAL, -3,
     { 20, 15, 15, 0 },
     { 7, 3, 5, 0 },
     3, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -633,8 +686,9 @@
 
 {
     MONS_UNSEEN_HORROR, 'x', MAGENTA, "unseen horror",
-    M_LEVITATE | M_SEE_INVIS | M_RES_ELEC | M_INVIS,
-    0, 12, MONS_UNSEEN_HORROR, MH_NATURAL, -3,
+    M_LEVITATE | M_SEE_INVIS | M_INVIS,
+    MR_RES_ELEC,
+    0, 12, MONS_UNSEEN_HORROR, MONS_UNSEEN_HORROR, MH_NATURAL, -3,
     { 12, 0, 0, 0 },
     { 7, 3, 5, 0 },
     5, 10, 30, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL_LIKE, 
@@ -644,8 +698,9 @@
 
 {
     MONS_VAMPIRE, 'V', RED, "vampire",
-    M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS,
-    0, 11, MONS_VAMPIRE, MH_UNDEAD, -6,
+    M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 11, MONS_VAMPIRE, MONS_VAMPIRE, MH_UNDEAD, -6,
     { 22, 0, 0, 0 },
     { 6, 3, 5, 0 },
     10, 10, 10, 7, MST_VAMPIRE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -655,8 +710,9 @@
 
 {
     MONS_WRAITH, 'W', DARKGREY, "wraith",
-    M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS,
-    0, 11, MONS_WRAITH, MH_UNDEAD, -7,
+    M_LEVITATE | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 11, MONS_WRAITH, MONS_WRAITH, MH_UNDEAD, -7,
     { 13, 0, 0, 0 },
     { 6, 3, 5, 0 },
     10, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -667,8 +723,9 @@
 // Large abom: (the previous one was small)
 {
     MONS_ABOMINATION_LARGE, 'X', BLACK, "abomination",
-    M_NO_FLAGS,
-    0, 10, MONS_ABOMINATION_LARGE, MH_DEMONIC, -7,
+    M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_ABOMINATION_SMALL, MONS_ABOMINATION_LARGE, MH_DEMONIC, -7,
     { 40, 0, 0, 0 },
     { 11, 2, 5, 0 },
     0, 0, 0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -678,8 +735,9 @@
 
 {
     MONS_YAK, 'Y', BROWN, "yak",
-      M_WARM_BLOOD,
-    1200, 10, MONS_YAK, MH_NATURAL, -3,
+    M_WARM_BLOOD,
+    MR_NO_FLAGS,
+    1200, 10, MONS_YAK, MONS_YAK, MH_NATURAL, -3,
     { 18, 0, 0, 0 },
     { 7, 3, 5, 0 },
     4, 7, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_BELLOW, I_ANIMAL, 
@@ -690,8 +748,9 @@
 // big zombie
 {
     MONS_ZOMBIE_LARGE, 'Z', BROWN, "",
-    M_RES_POISON | M_RES_COLD,
-    0, 6, MONS_ZOMBIE_LARGE, MH_UNDEAD, -1,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 6, MONS_ZOMBIE_SMALL, MONS_ZOMBIE_LARGE, MH_UNDEAD, -1,
     { 23, 0, 0, 0 },
     { 6, 3, 5, 0 },
     8, 5, 5, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -701,8 +760,9 @@
 
 {
     MONS_ORC_WARRIOR, 'o', YELLOW, "orc warrior",
-    M_WARM_BLOOD,
-    0, 10, MONS_ORC, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 4, 4, 6, 0 },
     0, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -712,8 +772,9 @@
 
 {
     MONS_KOBOLD_DEMONOLOGIST, 'K', MAGENTA, "kobold demonologist",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    0, 10, MONS_KOBOLD, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_KOBOLD, MONS_KOBOLD, MH_NATURAL, -5,
     { 4, 0, 0, 0 },
     { 4, 3, 5, 0 },
     2, 13, 10, 7, MST_KOBOLD_DEMONOLOGIST, CE_POISONOUS, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -723,8 +784,9 @@
 
 {
     MONS_ORC_WIZARD, 'o', MAGENTA, "orc wizard",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    0, 10, MONS_ORC, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -5,
     { 5, 0, 0, 0 },
     { 3, 3, 4, 0 },
     1, 12, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -734,8 +796,9 @@
 
 {
     MONS_ORC_KNIGHT, 'o', LIGHTCYAN, "orc knight",
-    M_WARM_BLOOD,
-    0, 10, MONS_ORC, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
     { 25, 0, 0, 0 },
     { 9, 4, 7, 0 },
     2, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -748,8 +811,9 @@
 // not until it can be reimplemented safely {dlb}
 {
     MONS_WORM_TAIL, '~', LIGHTRED, "worm tail",
-    M_NO_EXP_GAIN | M_RES_POISON,
-    0, 10, 56, MH_NATURAL, 5000,
+    M_NO_EXP_GAIN,
+    MR_RES_POISON,
+    0, 10, 56, MH_NATURAL, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 10, 5, 5, 0 },
     3, 3, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -760,8 +824,9 @@
 
 {
     MONS_WYVERN, 'D', LIGHTRED, "wyvern",
-      M_NO_FLAGS, //jmf: warm blood?
-    2000, 10, MONS_WYVERN, MH_NATURAL, -3,
+    M_NO_FLAGS, //jmf: warm blood?
+    MR_NO_FLAGS,
+    2000, 10, MONS_WYVERN, MONS_WYVERN, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 5, 3, 5, 0 },
     5, 10, 15, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -771,8 +836,9 @@
 
 {
     MONS_BIG_KOBOLD, 'K', RED, "big kobold",
-    M_WARM_BLOOD,
-    0, 10, MONS_BIG_KOBOLD, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_KOBOLD, MONS_BIG_KOBOLD, MH_NATURAL, -3,
     { 7, 0, 0, 0 },
     { 5, 3, 5, 0 },
     3, 12, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_NORMAL, 
@@ -783,7 +849,8 @@
 {
     MONS_GIANT_EYEBALL, 'G', WHITE, "giant eyeball",
     M_NO_SKELETON | M_LEVITATE,
-    400, 10, MONS_GIANT_EYEBALL, MH_NATURAL, -3,
+    MR_RES_ASPHYX,
+    400, 10, MONS_GIANT_EYEBALL, MONS_GIANT_EYEBALL, MH_NATURAL, -3,
     { 0, 0, 0, 0 },
     { 3, 3, 5, 0 },
     0, 1, 3, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_PLANT, 
@@ -793,8 +860,9 @@
 
 {
     MONS_WIGHT, 'W', LIGHTGREY, "wight",
-    M_RES_POISON | M_RES_COLD,
-    0, 10, MONS_WIGHT, MH_UNDEAD, -4,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_WRAITH, MONS_WIGHT, MH_UNDEAD, -4,
     { 8, 0, 0, 0 },
     { 3, 3, 5, 0 },
     4, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -804,8 +872,9 @@
 
 {
     MONS_OKLOB_PLANT, 'P', GREEN, "oklob plant",
-    M_RES_POISON,
-    0, 10, MONS_OKLOB_PLANT, MH_PLANT, -3,
+    M_SPECIAL_ABILITY,
+    MR_RES_POISON,
+    0, 10, MONS_PLANT, MONS_OKLOB_PLANT, MH_PLANT, -3,
     { 0, 0, 0, 0 },
     { 10, 3, 5, 0 },
     10, 0, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -815,8 +884,9 @@
 
 {
     MONS_WOLF_SPIDER, 's', BROWN, "wolf spider",
-    M_ED_POISON,
-    800, 10, MONS_WOLF_SPIDER, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    800, 10, MONS_WOLF_SPIDER, MONS_WOLF_SPIDER, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 8, 3, 5, 0 },
     3, 10, 15, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -826,8 +896,9 @@
 
 {
     MONS_SHADOW, ' ', BLACK, "shadow",
-    M_RES_POISON | M_RES_COLD | M_SEE_INVIS,
-    0, 10, MONS_SHADOW, MH_UNDEAD, -5,
+    M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_WRAITH, MONS_SHADOW, MH_UNDEAD, -5,
     { 5, 0, 0, 0 },
     { 3, 3, 5, 0 },
     12, 10, 10, 7, BLACK, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
@@ -837,8 +908,9 @@
 
 {
     MONS_HUNGRY_GHOST, 'p', GREEN, "hungry ghost",
-    M_RES_POISON | M_RES_COLD | M_SEE_INVIS | M_FLIES,
-    0, 10, MONS_HUNGRY_GHOST, MH_UNDEAD, -4,
+    M_SEE_INVIS | M_FLIES | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_PHANTOM, MONS_HUNGRY_GHOST, MH_UNDEAD, -4,
     { 5, 0, 0, 0 },
     { 7, 3, 5, 0 },
     0, 17, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -849,7 +921,8 @@
 {
     MONS_EYE_OF_DRAINING, 'G', LIGHTGREY, "eye of draining",
     M_NO_SKELETON | M_LEVITATE | M_SEE_INVIS,
-    400, 10, MONS_EYE_OF_DRAINING, MH_NATURAL, 5000,
+    MR_RES_ASPHYX,
+    400, 10, MONS_GIANT_EYEBALL, MONS_EYE_OF_DRAINING, MH_NATURAL, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 7, 3, 5, 0 },
     3, 1, 5, 7, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -859,8 +932,9 @@
 
 {
     MONS_BUTTERFLY, 'b', BLACK, "butterfly",
-    M_FLIES | M_ED_POISON | M_CONFUSED,
-    150, 10, MONS_BUTTERFLY, MH_NATURAL, -3,
+    M_FLIES | M_CONFUSED,
+    MR_VUL_POISON | MR_RES_ASPHYX,
+    150, 10, MONS_BUTTERFLY, MONS_BUTTERFLY, MH_NATURAL, -3,
     { 0, 0, 0, 0 },
     { 1, 3, 5, 0 },
     0, 25, 25, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, 
@@ -870,8 +944,9 @@
 
 {
     MONS_WANDERING_MUSHROOM, 'f', BROWN, "wandering mushroom",
-    M_RES_POISON,
-    0, 10, MONS_WANDERING_MUSHROOM, MH_PLANT, -3,
+    M_NO_FLAGS,
+    MR_RES_POISON,
+    0, 10, MONS_PLANT, MONS_WANDERING_MUSHROOM, MH_PLANT, -3,
     { 20, 0, 0, 0 },
     { 8, 3, 5, 0 },
     5, 0, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -881,8 +956,9 @@
 
 {
     MONS_EFREET, 'E', RED, "efreet",
-    M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_SPELLCASTER | M_LEVITATE,
-    0, 12, MONS_EFREET, MH_DEMONIC, -3,
+    M_SPELLCASTER | M_LEVITATE | M_EVIL,
+    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD,
+    0, 12, MONS_EFREET, MONS_EFREET, MH_DEMONIC, -3,
     { 12, 0, 0, 0 },
     { 7, 3, 5, 0 },
     10, 5, 10, 7, MST_EFREET, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -893,7 +969,8 @@
 {
     MONS_BRAIN_WORM, 'w', LIGHTMAGENTA, "brain worm",
     M_SPELLCASTER,
-    150, 10, MONS_BRAIN_WORM, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    150, 10, MONS_WORM, MONS_BRAIN_WORM, MH_NATURAL, -3,
     { 0, 0, 0, 0 },
     { 5, 3, 3, 0 },
     1, 5, 10, 7, MST_BRAIN_WORM, CE_POISONOUS, Z_SMALL, S_SILENT, I_REPTILE, 
@@ -904,7 +981,8 @@
 {
     MONS_GIANT_ORANGE_BRAIN, 'G', LIGHTRED, "giant orange brain",
     M_NO_SKELETON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS,
-    1000, 13, MONS_GIANT_ORANGE_BRAIN, MH_NATURAL, -8,
+    MR_RES_ASPHYX,
+    1000, 13, MONS_GIANT_ORANGE_BRAIN, MONS_GIANT_ORANGE_BRAIN, MH_NATURAL, -8,
     { 0, 0, 0, 0 },
     { 10, 3, 5, 0 },
     2, 4, 10, 7, MST_GIANT_ORANGE_BRAIN, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -914,8 +992,9 @@
 
 {
     MONS_BOULDER_BEETLE, 'B', LIGHTGREY, "boulder beetle",
-    M_ED_POISON,
-    2500, 10, MONS_BOULDER_BEETLE, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    2500, 10, MONS_GIANT_BEETLE, MONS_BOULDER_BEETLE, MH_NATURAL, -3,
     { 35, 0, 0, 0 },
     { 9, 3, 5, 0 },
     20, 2, 3, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -925,8 +1004,9 @@
 
 {
     MONS_FLYING_SKULL, 'z', WHITE, "flying skull",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE,
-    0, 10, MONS_FLYING_SKULL, MH_UNDEAD, -3,
+    M_LEVITATE,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_SKELETON_SMALL, MONS_FLYING_SKULL, MH_UNDEAD, -3,
     { 7, 0, 0, 0 },
     { 2, 3, 5, 0 },
     10, 17, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_ANIMAL, 
@@ -936,8 +1016,9 @@
 
 {
     MONS_HELL_HOUND, 'h', DARKGREY, "hell hound",
-    M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_SEE_INVIS,
-    0, 10, MONS_HELL_HOUND, MH_DEMONIC, -3,
+    M_SEE_INVIS | M_EVIL | M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 10, MONS_HOUND, MONS_HELL_HOUND, MH_DEMONIC, -3,
     { 13, 0, 0, 0 },
     { 5, 3, 5, 0 },
     6, 13, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_BARK, I_NORMAL, 
@@ -948,7 +1029,8 @@
 {
     MONS_MINOTAUR, 'm', LIGHTRED, "minotaur",
     M_WARM_BLOOD,
-    1500, 10, MONS_MINOTAUR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1500, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3,
     { 35, 0, 0, 0 },
     { 13, 3, 5, 0 },
     5, 7, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW, I_NORMAL, 
@@ -958,8 +1040,9 @@
 
 {
     MONS_ICE_DRAGON, 'D', WHITE, "ice dragon",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_FLIES,
-    2200, 10, MONS_ICE_DRAGON, MH_NATURAL, -3,
+    M_FLIES | M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    2200, 10, MONS_DRAGON, MONS_ICE_DRAGON, MH_NATURAL, -3,
     { 17, 17, 17, 0 },
     { 12, 5, 5, 0 },
     10, 8, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT, I_NORMAL, 
@@ -969,8 +1052,9 @@
 
 {
     MONS_SLIME_CREATURE, 'J', GREEN, "slime creature",
-    M_RES_POISON | M_AMPHIBIOUS,
-    0, 5, MONS_SLIME_CREATURE, MH_NATURAL, -3,
+    M_AMPHIBIOUS,
+    MR_RES_POISON,
+    0, 5, MONS_SLIME_CREATURE, MONS_SLIME_CREATURE, MH_NATURAL, -3,
     { 22, 0, 0, 0 },
     { 11, 3, 5, 0 },
     1, 4, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -980,8 +1064,9 @@
 
 {
     MONS_FREEZING_WRAITH, 'W', LIGHTBLUE, "freezing wraith",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_LEVITATE | M_SEE_INVIS,
-    0, 10, MONS_FREEZING_WRAITH, MH_UNDEAD, -4,
+    M_LEVITATE | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 10, MONS_WRAITH, MONS_FREEZING_WRAITH, MH_UNDEAD, -4,
     { 19, 0, 0, 0 },
     { 8, 3, 5, 0 },
     12, 10, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -992,8 +1077,9 @@
 // fake R - conjured by the R's illusion spell.
 {
     MONS_RAKSHASA_FAKE, 'R', YELLOW, "rakshasa",
-    M_RES_POISON,
-    0, 10, MONS_RAKSHASA_FAKE, MH_NATURAL, 5000,
+    M_EVIL,
+    MR_RES_POISON,
+    0, 10, MONS_RAKSHASA_FAKE, MONS_RAKSHASA_FAKE, MH_NATURAL, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 1, 0, 0, 1 },
     0, 30, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_PLANT, 
@@ -1003,8 +1089,9 @@
 
 {
     MONS_GREAT_ORB_OF_EYES, 'G', LIGHTGREEN, "great orb of eyes",
-    M_NO_SKELETON | M_RES_POISON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS,
-    900, 13, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, 5000,
+    M_NO_SKELETON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS,
+    MR_RES_POISON,
+    900, 13, MONS_GIANT_EYEBALL, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, MAG_IMMUNE,
     { 20, 0, 0, 0 },
     { 12, 3, 5, 0 },
     10, 3, 10, 7, MST_GREAT_ORB_OF_EYES, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1013,20 +1100,22 @@
 ,
 
 {
-    MONS_HELLION, '3', BLACK, "hellion",
-    M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_SPELLCASTER | M_ON_FIRE,
-    0, 11, MONS_HELLION, MH_DEMONIC, -7,
+    MONS_HELLION, '3', EC_FIRE, "hellion",
+    M_SPELLCASTER | M_EVIL,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 11, MONS_HELLION, MONS_HELLION, MH_DEMONIC, -7,
     { 10, 0, 0, 0 },
     { 7, 3, 5, 0 },
-    5, 10, 13, 7, RED, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
+    5, 10, 13, 7, MST_BURNING_DEVIL, CE_NOCORPSE, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
     MONUSE_OPEN_DOORS
 }
 ,
 
 {
     MONS_ROTTING_DEVIL, '4', GREEN, "rotting devil",
-    M_RES_POISON | M_RES_COLD,
-    0, 10, MONS_ROTTING_DEVIL, MH_DEMONIC, -7,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_ROTTING_DEVIL, MONS_ROTTING_DEVIL, MH_DEMONIC, -7,
     { 8, 0, 0, 0 },
     { 5, 3, 5, 0 },
     2, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1036,8 +1125,9 @@
 
 {
     MONS_TORMENTOR, '3', YELLOW, "tormentor",
-    M_RES_POISON | M_RES_FIRE | M_SPELLCASTER | M_FLIES | M_SPEAKS,
-    0, 10, MONS_TORMENTOR, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL,
+    MR_RES_POISON | MR_RES_FIRE,
+    0, 10, MONS_TORMENTOR, MONS_TORMENTOR, MH_DEMONIC, -6,
     { 8, 8, 0, 0 },
     { 7, 3, 5, 0 },
     12, 12, 13, 7, MST_TORMENTOR, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -1047,8 +1137,9 @@
 
 {
     MONS_REAPER, '2', LIGHTGREY, "reaper",
-    M_RES_POISON | M_RES_COLD | M_SEE_INVIS,
-    0, 10, MONS_REAPER, MH_DEMONIC, 5000,
+    M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_REAPER, MONS_REAPER, MH_DEMONIC, MAG_IMMUNE,
     { 32, 0, 0, 0 },
     { 8, 3, 5, 0 },
     15, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1058,8 +1149,9 @@
 
 {
     MONS_SOUL_EATER, '2', DARKGREY, "soul eater",
-    M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS,
-    0, 12, MONS_SOUL_EATER, MH_DEMONIC, -10,
+    M_LEVITATE | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 12, MONS_SOUL_EATER, MONS_SOUL_EATER, MH_DEMONIC, -10,
     { 25, 0, 0, 0 },
     { 11, 3, 5, 0 },
     18, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1069,8 +1161,9 @@
 
 {
     MONS_HAIRY_DEVIL, '4', LIGHTRED, "hairy devil",
-    M_RES_POISON,
-    0, 10, MONS_HAIRY_DEVIL, MH_DEMONIC, -4,
+    M_EVIL,
+    MR_RES_POISON,
+    0, 10, MONS_HAIRY_DEVIL, MONS_HAIRY_DEVIL, MH_DEMONIC, -4,
     { 9, 9, 0, 0 },
     { 6, 3, 5, 0 },
     7, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -1080,8 +1173,9 @@
 
 {
     MONS_ICE_DEVIL, '2', WHITE, "ice devil",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_SEE_INVIS,
-    0, 11, MONS_ICE_DEVIL, MH_DEMONIC, -6,
+    M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 11, MONS_ICE_DEVIL, MONS_ICE_DEVIL, MH_DEMONIC, -6,
     { 16, 0, 0, 0 },
     { 11, 3, 5, 0 },
     12, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1091,8 +1185,9 @@
 
 {
     MONS_BLUE_DEVIL, '3', BLUE, "blue devil",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_FLIES,
-    0, 10, MONS_BLUE_DEVIL, MH_DEMONIC, -5,
+    M_FLIES | M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 10, MONS_BLUE_DEVIL, MONS_BLUE_DEVIL, MH_DEMONIC, -5,
     { 21, 0, 0, 0 },
     { 7, 3, 5, 0 },
     14, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1103,8 +1198,9 @@
 // random
 {
     MONS_BEAST, '4', BROWN, "beast",
-    M_NO_FLAGS,
-    0, 10, MONS_BEAST, MH_DEMONIC, -3,
+    M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_BEAST, MONS_BEAST, MH_DEMONIC, -3,
     { 12, 0, 0, 0 },
     { 5, 3, 5, 0 },
     0, 0, 0, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_RANDOM, I_NORMAL, 
@@ -1114,8 +1210,9 @@
 
 {
     MONS_IRON_DEVIL, '3', CYAN, "iron devil",
-    M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD,
-    0, 10, MONS_IRON_DEVIL, MH_DEMONIC, -6,
+    M_EVIL,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
+    0, 10, MONS_IRON_DEVIL, MONS_IRON_DEVIL, MH_DEMONIC, -6,
     { 14, 14, 0, 0 },
     { 8, 3, 5, 0 },
     16, 8, 8, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREECH, I_HIGH, 
@@ -1126,7 +1223,8 @@
 {
     MONS_GLOWING_SHAPESHIFTER, '@', RED, "glowing shapeshifter",
     M_NO_FLAGS,
-    600, 10, MONS_SHAPESHIFTER, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    600, 10, MONS_SHAPESHIFTER, MONS_GLOWING_SHAPESHIFTER, MH_NATURAL, -6,
     { 15, 0, 0, 0 },
     { 10, 3, 5, 0 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1137,7 +1235,8 @@
 {
     MONS_SHAPESHIFTER, '@', LIGHTRED, "shapeshifter",
     M_NO_FLAGS,
-    600, 10, MONS_SHAPESHIFTER, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    600, 10, MONS_SHAPESHIFTER, MONS_SHAPESHIFTER, MH_NATURAL, -6,
     { 5, 0, 0, 0 },
     { 7, 3, 5, 0 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1147,8 +1246,9 @@
 
 {
     MONS_GIANT_MITE, 's', LIGHTRED, "giant mite",
-    M_ED_POISON,
-    350, 10, MONS_GIANT_MITE, MH_NATURAL, -1,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    350, 10, MONS_GIANT_MITE, MONS_GIANT_MITE, MH_NATURAL, -1,
     { 5, 0, 0, 0 },
     { 2, 3, 5, 0 },
     1, 7, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -1157,9 +1257,10 @@
 ,
 
 {
-    MONS_STEAM_DRAGON, 'd', LIGHTGREY, "steam dragon",
+    MONS_STEAM_DRAGON, 'D', LIGHTGREY, "steam dragon",
     M_SPELLCASTER | M_FLIES,
-    1000, 10, MONS_STEAM_DRAGON, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1000, 10, MONS_DRAGON, MONS_STEAM_DRAGON, MH_NATURAL, -3,
     { 12, 0, 0, 0 },
     { 4, 5, 5, 0 },
     5, 10, 10, 7, MST_STEAM_DRAGON, CE_CLEAN, Z_BIG, S_SILENT, I_ANIMAL_LIKE, 
@@ -1170,7 +1271,8 @@
 {
     MONS_VERY_UGLY_THING, 'u', RED, "very ugly thing",
     M_WARM_BLOOD | M_AMPHIBIOUS,
-    750, 10, MONS_VERY_UGLY_THING, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    750, 10, MONS_UGLY_THING, MONS_VERY_UGLY_THING, MH_NATURAL, -3,
     { 17, 0, 0, 0 },
     { 12, 3, 5, 0 },
     4, 8, 8, 7, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1180,8 +1282,9 @@
 
 {
     MONS_ORC_SORCERER, 'o', DARKGREY, "orc sorcerer",
-    M_RES_FIRE | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    600, 12, MONS_ORC, MH_NATURAL, -3,
+    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL,
+    MR_RES_FIRE,
+    600, 12, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
     { 7, 0, 0, 0 },
     { 8, 2, 3, 0 },
     5, 12, 10, 7, MST_ORC_SORCERER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -1192,7 +1295,8 @@
 {
     MONS_HIPPOGRIFF, 'H', BROWN, "hippogriff",
     M_FLIES | M_WARM_BLOOD,
-    1000, 10, MONS_HIPPOGRIFF, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1000, 10, MONS_HIPPOGRIFF, MONS_HIPPOGRIFF, MH_NATURAL, -3,
     { 10, 8, 8, 0 },
     { 7, 3, 5, 0 },
     2, 7, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL, 
@@ -1203,7 +1307,8 @@
 {
     MONS_GRIFFON, 'H', YELLOW, "griffon",
     M_FLIES | M_WARM_BLOOD,
-    1800, 10, MONS_GRIFFON, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1800, 10, MONS_GRIFFON, MONS_GRIFFON, MH_NATURAL, -3,
     { 18, 10, 10, 0 },
     { 12, 3, 5, 0 },
     4, 6, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL, 
@@ -1213,8 +1318,9 @@
 
 {
     MONS_HYDRA, 'D', LIGHTGREEN, "hydra",
-    M_RES_POISON | M_AMPHIBIOUS,  // because it likes the swamp -- bwr
-    1800, 11, MONS_HYDRA, MH_NATURAL, -3,
+    M_AMPHIBIOUS,  // because it likes the swamp -- bwr
+    MR_RES_POISON,
+    1800, 11, MONS_HYDRA, MONS_HYDRA, MH_NATURAL, -3,
     { 18, 0, 0, 0 },
     { 13, 3, 5, 0 },
     0, 5, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_ROAR, I_REPTILE, 
@@ -1225,8 +1331,9 @@
 // small skeleton
 {
     MONS_SKELETON_SMALL, 'z', LIGHTGREY, "",
-    M_RES_POISON | M_RES_COLD,
-    0, 10, MONS_SKELETON_SMALL, MH_UNDEAD, -1,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_SKELETON_SMALL, MONS_SKELETON_SMALL, MH_UNDEAD, -1,
     { 0, 0, 0, 0 },
     { 0, 0, 0, 0 },
     0, 0, 0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1237,8 +1344,9 @@
 // large skeleton
 {
     MONS_SKELETON_LARGE, 'Z', LIGHTGREY, "",
-    M_RES_POISON | M_RES_COLD,
-    0, 10, MONS_SKELETON_LARGE, MH_UNDEAD, -1,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_SKELETON_SMALL, MONS_SKELETON_LARGE, MH_UNDEAD, -1,
     { 0, 0, 0, 0 },
     { 0, 0, 0, 0 },
     0, 0, 0, 0, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1249,8 +1357,9 @@
 
 {
     MONS_HELL_KNIGHT, '@', RED, "hell knight",
-    M_RES_FIRE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    550, 10, MONS_HUMAN, MH_NATURAL, -3,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL,
+    MR_RES_FIRE,
+    550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { 13, 0, 0, 0 },
     { 10, 3, 6, 0 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -1260,8 +1369,9 @@
 
 {
     MONS_NECROMANCER, '@', DARKGREY, "necromancer",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    550, 10, MONS_HUMAN, MH_NATURAL, -4,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
     { 6, 0, 0, 0 },
     { 10, 2, 4, 0 },
     0, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -1271,8 +1381,9 @@
 
 {
     MONS_WIZARD, '@', MAGENTA, "wizard",
-    M_RES_ELEC | M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    550, 10, MONS_HUMAN, MH_NATURAL, -4,
+    M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD,
+    MR_RES_ELEC,
+    550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
     { 6, 0, 0, 0 },
     { 10, 2, 4, 0 },
     0, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -1282,8 +1393,9 @@
 
 {
     MONS_ORC_PRIEST, 'o', LIGHTGREEN, "orc priest",
-    M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD,
-    600, 10, MONS_ORC, MH_NATURAL, -4,
+    M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    600, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -4,
     { 6, 0, 0, 0 },
     { 3, 3, 4, 0 },
     1, 10, 10, 7, MST_ORC_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -1293,8 +1405,9 @@
 
 {
     MONS_ORC_HIGH_PRIEST, 'o', GREEN, "orc high priest",
-    M_RES_HELLFIRE | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_PRIEST | M_WARM_BLOOD,
-      600, 10, MONS_ORC, MH_NATURAL, -4,
+    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_EVIL,
+      MR_RES_HELLFIRE,
+      600, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -4,
     { 7, 0, 0, 0 },
     { 11, 3, 4, 0 },
     1, 12, 10, 7, MST_ORC_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -1310,7 +1423,8 @@
 {
     MONS_HUMAN, '@', LIGHTGRAY, "human",
     M_WARM_BLOOD,
-    550, 10, MONS_HUMAN, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 1, 3, 5, 0 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -1321,7 +1435,8 @@
 {
     MONS_GNOLL, 'g', YELLOW, "gnoll",
     M_WARM_BLOOD,
-    750, 10, MONS_GNOLL, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    750, 10, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3,
     { 9, 0, 0, 0 },
     { 2, 4, 5, 0 },
     2, 9, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -1331,8 +1446,9 @@
 
 {
     MONS_CLAY_GOLEM, '8', BROWN, "clay golem",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS,
-    0, 10, MONS_CLAY_GOLEM, MH_NONLIVING, 5000,
+    M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_CLAY_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 11, 11, 0, 0 },
     { 8, 7, 3, 0 },
     7, 5, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1342,8 +1458,9 @@
 
 {
     MONS_WOOD_GOLEM, '8', YELLOW, "wood golem",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD | M_RES_ELEC,
-    0, 10, MONS_WOOD_GOLEM, MH_NONLIVING, 5000,
+    M_NO_FLAGS,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_WOOD_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 10, 0, 0, 0 },
     { 6, 6, 3, 0 },
     5, 6, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1353,8 +1470,9 @@
 
 {
     MONS_STONE_GOLEM, '8', LIGHTGREY, "stone golem",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC,
-    0, 10, MONS_STONE_GOLEM, MH_NONLIVING, 5000,
+    M_NO_FLAGS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_STONE_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 28, 0, 0, 0 },
     { 12, 7, 4, 0 },
     12, 4, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1364,8 +1482,9 @@
 
 {
     MONS_IRON_GOLEM, '8', CYAN, "iron golem",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS,
-    0, 10, MONS_IRON_GOLEM, MH_NONLIVING, 5000,
+    M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_IRON_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 35, 0, 0, 0 },
     { 15, 7, 4, 0 },
     15, 3, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1375,8 +1494,9 @@
 
 {
     MONS_CRYSTAL_GOLEM, '8', WHITE, "crystal golem",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS,
-    0, 10, MONS_CRYSTAL_GOLEM, MH_NONLIVING, 5000,
+    M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_CRYSTAL_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 40, 0, 0, 0 },
     { 13, 7, 4, 0 },
     22, 3, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1386,8 +1506,9 @@
 
 {
     MONS_TOENAIL_GOLEM, '8', LIGHTGREY, "toenail golem",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC,
-    0, 10, MONS_TOENAIL_GOLEM, MH_NONLIVING, 5000,
+    M_NO_FLAGS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_TOENAIL_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 13, 0, 0, 0 },
     { 9, 5, 3, 0 },
     8, 5, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1396,9 +1517,10 @@
 ,
 
 {
-    MONS_MOTTLED_DRAGON, 'd', LIGHTMAGENTA, "mottled dragon",
-    M_RES_POISON | M_RES_FIRE | M_SPELLCASTER | M_FLIES,
-    1100, 10, MONS_MOTTLED_DRAGON, MH_NATURAL, -3,
+    MONS_MOTTLED_DRAGON, 'D', RED, "mottled dragon",
+    M_SPELLCASTER | M_FLIES,
+    MR_RES_POISON | MR_RES_FIRE,
+    1100, 10, MONS_DRAGON, MONS_MOTTLED_DRAGON, MH_NATURAL, -3,
     { 15, 0, 0, 0 },
     { 5, 3, 5, 0 },
     5, 10, 10, 7, MST_MOTTLED_DRAGON, CE_POISONOUS, Z_BIG, S_SILENT, I_ANIMAL_LIKE, 
@@ -1408,8 +1530,9 @@
 
 {
     MONS_EARTH_ELEMENTAL, '#', BROWN, "earth elemental",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC,
-    0, 10, MONS_EARTH_ELEMENTAL, MH_NONLIVING, 5000,
+    M_NO_FLAGS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_EARTH_ELEMENTAL, MONS_EARTH_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
     { 40, 0, 0, 0 },
     { 6, 5, 5, 0 },
     14, 4, 6, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1419,8 +1542,9 @@
 
 {
     MONS_FIRE_ELEMENTAL, '#', YELLOW, "fire elemental",
-    M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_RES_ELEC | M_FLIES,
-    0, 10, MONS_FIRE_ELEMENTAL, MH_NONLIVING, 5000,
+    M_FLIES,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC,
+    0, 10, MONS_EARTH_ELEMENTAL, MONS_FIRE_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
     { 5, 0, 0, 0 },
     { 6, 3, 5, 0 },
     4, 12, 13, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1430,8 +1554,9 @@
 
 {
     MONS_AIR_ELEMENTAL, 'v', LIGHTGREY, "air elemental",
-    M_RES_ELEC | M_RES_POISON | M_LEVITATE | M_SEE_INVIS | M_FLIES,
-    0, 5, MONS_AIR_ELEMENTAL, MH_NONLIVING, 5000,
+    M_LEVITATE | M_SEE_INVIS | M_FLIES,
+    MR_RES_ELEC | MR_RES_POISON,
+    0, 5, MONS_EARTH_ELEMENTAL, MONS_AIR_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
     { 15, 0, 0, 0 },
     { 6, 3, 5, 0 },
     2, 18, 25, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1443,8 +1568,9 @@
 
 {
     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,
-    0, 10, MONS_ICE_FIEND, MH_DEMONIC, -12,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_FROZEN | M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 10, MONS_FIEND, MONS_ICE_FIEND, MH_DEMONIC, -12,
     { 25, 25, 0, 0 },
     { 18, 3, 5, 0 },
     15, 6, 10, 7, MST_ICE_FIEND, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -1454,8 +1580,9 @@
 
 {
     MONS_SHADOW_FIEND, '1', DARKGREY, "Shadow Fiend",
-    M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS,
-    0, 10, MONS_SHADOW_FIEND, MH_DEMONIC, -13,
+    M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_FIEND, MONS_SHADOW_FIEND, MH_DEMONIC, -13,
     { 25, 15, 15, 0 },
     { 18, 3, 5, 0 },
     15, 6, 10, 7, MST_SHADOW_FIEND, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -1465,8 +1592,9 @@
 
 {
     MONS_BROWN_SNAKE, 'S', BROWN, "brown snake",
-    M_RES_POISON | M_COLD_BLOOD | M_AMPHIBIOUS,
-    300, 10, MONS_BROWN_SNAKE, MH_NATURAL, -3,
+    M_COLD_BLOOD | M_AMPHIBIOUS,
+    MR_RES_POISON,
+    300, 10, MONS_SNAKE, MONS_BROWN_SNAKE, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 4, 3, 5, 0 },
     2, 15, 14, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_REPTILE, 
@@ -1477,7 +1605,8 @@
 {
     MONS_GIANT_LIZARD, 'l', GREEN, "giant lizard",
     M_COLD_BLOOD,
-    600, 10, MONS_GIANT_LIZARD, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    600, 10, MONS_GIANT_LIZARD, MONS_GIANT_LIZARD, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 5, 3, 5, 0 },
     4, 10, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_REPTILE, 
@@ -1487,8 +1616,9 @@
 
 {
     MONS_SPECTRAL_WARRIOR, 'W', LIGHTGREEN, "spectral warrior",
-    M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS,
-    0, 13, MONS_SPECTRAL_WARRIOR, MH_UNDEAD, -6,
+    M_LEVITATE | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 13, MONS_WRAITH, MONS_SPECTRAL_WARRIOR, MH_UNDEAD, -6,
     { 18, 0, 0, 0 },
     { 9, 3, 5, 0 },
     12, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -1498,8 +1628,9 @@
 
 {
     MONS_PULSATING_LUMP, 'J', RED, "pulsating lump",
-    M_RES_POISON | M_SEE_INVIS,
-    0, 3, MONS_PULSATING_LUMP, MH_NATURAL, -3,
+    M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 3, MONS_JELLY, MONS_PULSATING_LUMP, MH_NATURAL, -3,
     { 13, 0, 0, 0 },
     { 10, 3, 5, 0 },
     2, 6, 5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1509,8 +1640,9 @@
 
 {
     MONS_STORM_DRAGON, 'D', LIGHTBLUE, "storm dragon",
-    M_RES_ELEC | M_RES_COLD | M_SPELLCASTER | M_FLIES,
-    2800, 12, MONS_STORM_DRAGON, MH_NATURAL, -5,
+    M_SPELLCASTER | M_FLIES,
+    MR_RES_ELEC | MR_RES_COLD,
+    2800, 12, MONS_DRAGON, MONS_STORM_DRAGON, MH_NATURAL, -5,
     { 25, 15, 15, 0 },
     { 14, 5, 5, 0 },
     13, 10, 12, 7, MST_STORM_DRAGON, CE_CLEAN, Z_BIG, S_ROAR, I_NORMAL, 
@@ -1521,7 +1653,8 @@
 {
     MONS_YAKTAUR, 'c', LIGHTRED, "yaktaur",
     M_WARM_BLOOD,
-    2000, 10, MONS_YAKTAUR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    2000, 10, MONS_YAKTAUR, MONS_YAKTAUR, MH_NATURAL, -3,
     { 15, 0, 0, 0 },
     { 8, 3, 5, 0 },
     4, 4, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1531,8 +1664,9 @@
 
 {
     MONS_DEATH_YAK, 'Y', DARKGREY, "death yak",
-    M_WARM_BLOOD,
-    1500, 10, MONS_DEATH_YAK, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    1500, 10, MONS_YAK, MONS_DEATH_YAK, MH_NATURAL, -5,
     { 30, 0, 0, 0 },
     { 14, 3, 5, 0 },
     9, 5, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_BELLOW, I_ANIMAL, 
@@ -1542,8 +1676,9 @@
 
 {
     MONS_ROCK_TROLL, 'T', LIGHTGREY, "rock troll",
-    M_WARM_BLOOD,
-    2200, 11, MONS_ROCK_TROLL, MH_NATURAL, -4,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    2200, 11, MONS_TROLL, MONS_ROCK_TROLL, MH_NATURAL, -4,
     { 30, 20, 20, 0 },
     { 11, 3, 5, 0 },
     13, 6, 8, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1553,8 +1688,9 @@
 
 {
     MONS_STONE_GIANT, 'C', LIGHTGREY, "stone giant",
-    M_WARM_BLOOD,
-    3000, 10, MONS_STONE_GIANT, MH_NATURAL, -4,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    3000, 10, MONS_HILL_GIANT, MONS_STONE_GIANT, MH_NATURAL, -4,
     { 45, 0, 0, 0 },
     { 16, 3, 5, 0 },
     12, 2, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1564,8 +1700,9 @@
 
 {
     MONS_FLAYED_GHOST, 'p', RED, "flayed ghost",
-    M_RES_POISON | M_FLIES,
-    0, 10, MONS_FLAYED_GHOST, MH_UNDEAD, -4,
+    M_FLIES | M_EVIL,
+    MR_RES_POISON,
+    0, 10, MONS_PHANTOM, MONS_FLAYED_GHOST, MH_UNDEAD, -4,
     { 30, 0, 0, 0 },
     { 11, 3, 5, 0 },
     0, 14, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1575,8 +1712,9 @@
 
 {
     MONS_BUMBLEBEE, 'k', RED, "bumblebee",
-    M_ED_POISON | M_FLIES,
-    300, 10, MONS_BUMBLEBEE, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    300, 10, MONS_KILLER_BEE, MONS_BUMBLEBEE, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 7, 3, 5, 0 },
     4, 15, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_BUZZ, I_INSECT, 
@@ -1586,8 +1724,9 @@
 
 {
     MONS_REDBACK, 's', RED, "redback",
-    M_ED_POISON,
-    1000, 14, MONS_REDBACK, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    1000, 14, MONS_WOLF_SPIDER, MONS_REDBACK, MH_NATURAL, -3,
     { 18, 0, 0, 0 },
     { 6, 3, 5, 0 },
     2, 12, 15, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -1597,8 +1736,9 @@
 
 {
     MONS_INSUBSTANTIAL_WISP, 'p', LIGHTGREY, "insubstantial wisp",
-    M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_LEVITATE,
-    0, 17, MONS_INSUBSTANTIAL_WISP, MH_NONLIVING, 5000,
+    M_LEVITATE | M_SPECIAL_ABILITY,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
+    0, 17, MONS_INSUBSTANTIAL_WISP, MONS_INSUBSTANTIAL_WISP, MH_NONLIVING, MAG_IMMUNE,
     { 12, 0, 0, 0 },
     { 6, 1, 2, 0 },
     20, 20, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_PLANT, 
@@ -1608,8 +1748,9 @@
 
 {
     MONS_VAPOUR, '#', LIGHTGREY, "vapour",
-    M_RES_ELEC | M_RES_POISON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED,
-    0, 21, MONS_VAPOUR, MH_NONLIVING, 5000,
+    M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED,
+    MR_RES_ELEC | MR_RES_POISON,
+    0, 21, MONS_VAPOUR, MONS_VAPOUR, MH_NONLIVING, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 12, 2, 3, 0 },
     0, 12, 10, 7, MST_STORM_DRAGON, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1619,8 +1760,9 @@
 
 {
     MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage",
-    M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD,
-    0, 16, MONS_OGRE, MH_NATURAL, -6,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_EVIL,
+    MR_RES_ELEC,
+    0, 16, MONS_OGRE, MONS_OGRE, MH_NATURAL, -6,
     { 12, 0, 0, 0 },
     { 10, 3, 5, 0 },
     1, 7, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_HIGH, 
@@ -1630,8 +1772,9 @@
 
 {
     MONS_SPINY_WORM, 'w', DARKGREY, "spiny worm",
-    M_ED_POISON,
-    1300, 13, MONS_SPINY_WORM, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    1300, 13, MONS_WORM, MONS_SPINY_WORM, MH_NATURAL, -3,
     { 32, 0, 0, 0 },
     { 12, 3, 5, 0 },
     10, 6, 9, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_PLANT, 
@@ -1643,8 +1786,9 @@
 //  to examine them.
 {
     MONS_DANCING_WEAPON, '(', BLACK, "dancing weapon",
-    M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE,
-    0, 10, MONS_DANCING_WEAPON, MH_NONLIVING, 5000,
+    M_LEVITATE,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_DANCING_WEAPON, MONS_DANCING_WEAPON, MH_NONLIVING, MAG_IMMUNE,
     { 30, 0, 0, 0 },
     { 15, 0, 0, 15 },
     10, 20, 15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -1654,8 +1798,9 @@
 
 {
     MONS_TITAN, 'C', MAGENTA, "titan",
-    M_RES_ELEC | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS,
-    3500, 12, MONS_TITAN, MH_NATURAL, -7,
+    M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_RES_ELEC,
+    3500, 12, MONS_HILL_GIANT, MONS_TITAN, MH_NATURAL, -7,
     { 55, 0, 0, 0 },
     { 20, 3, 5, 0 },
     10, 3, 10, 7, MST_TITAN, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
@@ -1665,8 +1810,9 @@
 
 {
     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,
-    3000, 17, MONS_GOLDEN_DRAGON, MH_NATURAL, -8,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
+    3000, 17, MONS_DRAGON, MONS_GOLDEN_DRAGON, MH_NATURAL, -8,
     { 40, 20, 20, 0 },
     { 18, 4, 4, 0 },
     15, 7, 10, 7, MST_GOLDEN_DRAGON, CE_POISONOUS, Z_BIG, S_ROAR, I_HIGH, 
@@ -1679,10 +1825,11 @@
 {
     MONS_ELF, 'e', DARKGREY, "elf",
     M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 3, 3, 3, 0 },
-    0, 12, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_PLANT, 
+    0, 12, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_NORMAL,
     MONUSE_WEAPONS_ARMOUR
 }
 ,
@@ -1693,8 +1840,9 @@
 // more intuitively know that this isn't a regular lizard. -- bwr
 {
     MONS_LINDWURM, 'd', LIGHTGREEN, "lindwurm",
-    M_NO_FLAGS,
-    1000, 11, MONS_LINDWURM, MH_NATURAL, -3,
+    M_SPECIAL_ABILITY,
+    MR_NO_FLAGS,
+    1000, 11, MONS_DRAGON, MONS_LINDWURM, MH_NATURAL, -3,
     { 20, 10, 10, 0 },
     { 9, 3, 5, 0 },
     8, 6, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_ROAR, I_REPTILE, 
@@ -1704,8 +1852,9 @@
 
 {
     MONS_ELEPHANT_SLUG, 'm', LIGHTGREY, "elephant slug",
-    M_ED_POISON | M_NO_SKELETON,
-    1500, 10, MONS_ELEPHANT_SLUG, MH_NATURAL, -3,
+    M_NO_SKELETON,
+    MR_VUL_POISON,
+    1500, 10, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3,
     { 40, 0, 0, 0 },
     { 20, 5, 3, 0 },
     2, 1, 4, 10, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -1716,7 +1865,8 @@
 {
     MONS_WAR_DOG, 'h', CYAN, "war dog",
     M_SEE_INVIS | M_WARM_BLOOD,
-    350, 10, MONS_WAR_DOG, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    350, 10, MONS_HOUND, MONS_WAR_DOG, MH_NATURAL, -3,
     { 12, 0, 0, 0 },
     { 4, 3, 5, 0 },
     4, 15, 17, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, I_ANIMAL, 
@@ -1727,7 +1877,8 @@
 {
     MONS_GREY_RAT, 'r', LIGHTGREY, "grey rat",
     M_WARM_BLOOD,
-    250, 10, MONS_GREY_RAT, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    250, 10, MONS_RAT, MONS_GREY_RAT, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 1, 3, 6, 0 },
     2, 12, 12, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -1738,7 +1889,8 @@
 {
     MONS_GREEN_RAT, 'r', LIGHTGREEN, "green rat",
     M_WARM_BLOOD,
-    250, 10, MONS_GREEN_RAT, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    250, 10, MONS_RAT, MONS_GREEN_RAT, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 2, 3, 5, 0 },
     5, 11, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -1749,7 +1901,8 @@
 {
     MONS_ORANGE_RAT, 'r', LIGHTRED, "orange rat",
     M_WARM_BLOOD,
-    250, 10, MONS_ORANGE_RAT, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    250, 10, MONS_RAT, MONS_ORANGE_RAT, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 3, 3, 5, 0 },
     7, 10, 12, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_ROAR, I_ANIMAL, 
@@ -1759,8 +1912,9 @@
 
 {
     MONS_BLACK_SNAKE, 'S', DARKGREY, "black snake",
-    M_RES_POISON | M_COLD_BLOOD,
-    500, 12, MONS_BLACK_SNAKE, MH_NATURAL, -3,
+    M_COLD_BLOOD,
+    MR_RES_POISON,
+    500, 12, MONS_SNAKE, MONS_BLACK_SNAKE, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 7, 3, 5, 0 },
     4, 15, 18, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_REPTILE, 
@@ -1771,7 +1925,8 @@
 {
     MONS_SHEEP, 'Y', LIGHTGREY, "sheep",
     M_WARM_BLOOD,
-    1200, 10, MONS_SHEEP, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1200, 10, MONS_SHEEP, MONS_SHEEP, MH_NATURAL, -3,
     { 13, 0, 0, 0 },
     { 3, 3, 5, 0 },
     2, 7, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BELLOW, I_ANIMAL, 
@@ -1781,8 +1936,9 @@
 
 {
     MONS_GHOUL, 'n', RED, "ghoul",
-    M_RES_POISON | M_RES_COLD,
-    500, 12, MONS_GHOUL, MH_UNDEAD, -5,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    500, 12, MONS_GHOUL, MONS_GHOUL, MH_UNDEAD, -5,
     { 9, 0, 0, 0 },
     { 4, 3, 5, 0 },
     4, 10, 10, 7, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -1793,7 +1949,8 @@
 {
     MONS_HOG, 'h', LIGHTRED, "hog",
     M_WARM_BLOOD,
-    700, 10, MONS_HOG, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    700, 10, MONS_HOG, MONS_HOG, MH_NATURAL, -3,
     { 14, 0, 0, 0 },
     { 6, 3, 5, 0 },
     2, 9, 13, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -1803,8 +1960,9 @@
 
 {
     MONS_GIANT_MOSQUITO, 'y', DARKGREY, "giant mosquito",
-    M_ED_POISON | M_FLIES,
-    100, 10, MONS_GIANT_MOSQUITO, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    100, 10, MONS_GIANT_MOSQUITO, MONS_GIANT_MOSQUITO, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 1, 3, 5, 0 },
     0, 13, 12, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_WHINE, I_PLANT, 
@@ -1814,8 +1972,9 @@
 
 {
     MONS_GIANT_CENTIPEDE, 's', GREEN, "giant centipede",
-    M_ED_POISON,
-    350, 10, MONS_GIANT_CENTIPEDE, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    350, 10, MONS_GIANT_CENTIPEDE, MONS_GIANT_CENTIPEDE, MH_NATURAL, -3,
     { 2, 0, 0, 0 },
     { 2, 3, 3, 0 },
     2, 14, 13, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -1827,8 +1986,9 @@
 
 {
     MONS_IRON_TROLL, 'T', CYAN, "iron troll",
-    M_RES_FIRE | M_RES_COLD | M_WARM_BLOOD,
-    2400, 10, MONS_IRON_TROLL, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_EVIL,
+    MR_RES_FIRE | MR_RES_COLD,
+    2400, 10, MONS_TROLL, MONS_IRON_TROLL, MH_NATURAL, -5,
     { 35, 25, 25, 0 },
     { 16, 3, 5, 0 },
     20, 4, 7, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_ROAR, I_NORMAL, 
@@ -1838,9 +1998,10 @@
 
 {
     MONS_NAGA, 'N', GREEN, "naga",
-    M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD,
-    750, 10, MONS_NAGA, MH_NATURAL, -6,
-    { 6, 0, 0, 0 },
+    M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD,
+    MR_RES_POISON,
+    750, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6,
+    { 13, 0, 0, 0 },
     { 5, 3, 5, 0 },
     6, 10, 8, 7, MST_NAGA, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
     MONUSE_WEAPONS_ARMOUR
@@ -1849,8 +2010,9 @@
 
 {
     MONS_FIRE_GIANT, 'C', RED, "fire giant",
-    M_RES_FIRE | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS,
-    2400, 11, MONS_FIRE_GIANT, MH_NATURAL, -4,
+    M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_RES_FIRE,
+    2400, 11, MONS_HILL_GIANT, MONS_FIRE_GIANT, MH_NATURAL, -4,
     { 30, 0, 0, 0 },
     { 16, 3, 6, 0 },
     8, 4, 10, 7, MST_EFREET, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1860,8 +2022,9 @@
 
 {
     MONS_FROST_GIANT, 'C', LIGHTBLUE, "frost giant",
-    M_RES_COLD | M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS,
-    2600, 11, MONS_FROST_GIANT, MH_NATURAL, -4,
+    M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_RES_COLD,
+    2600, 11, MONS_HILL_GIANT, MONS_FROST_GIANT, MH_NATURAL, -4,
     { 35, 0, 0, 0 },
     { 16, 4, 5, 0 },
     9, 3, 10, 7, MST_FROST_GIANT, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1870,9 +2033,10 @@
 ,
 
 {
-    MONS_FIREDRAKE, 'd', RED, "firedrake",
-    M_RES_FIRE | M_FLIES,
-    900, 10, MONS_FIREDRAKE, MH_NATURAL, -3,
+    MONS_FIREDRAKE, 'l', RED, "firedrake",
+    M_FLIES | M_SPECIAL_ABILITY,
+    MR_RES_FIRE,
+    900, 10, MONS_FIREDRAKE, MONS_FIREDRAKE, MH_NATURAL, -3,
     { 8, 0, 0, 0 },
     { 6, 3, 5, 0 },
     3, 12, 12, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_ANIMAL, 
@@ -1882,8 +2046,9 @@
 
 {
     MONS_SHADOW_DRAGON, 'D', DARKGREY, "shadow dragon",
-    M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
-    2000, 12, MONS_SHADOW_DRAGON, MH_NATURAL, -5,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_COLD,
+    2000, 12, MONS_DRAGON, MONS_SHADOW_DRAGON, MH_NATURAL, -5,
     { 20, 15, 15, 0 },
     { 17, 5, 5, 0 },
     15, 10, 10, 7, MST_SHADOW_DRAGON, CE_CLEAN, Z_BIG, S_ROAR, I_HIGH, 
@@ -1892,8 +2057,9 @@
 ,
 {
     MONS_YELLOW_SNAKE, 'S', YELLOW, "yellow snake",
-    M_RES_POISON | M_COLD_BLOOD,
-    400, 10, MONS_YELLOW_SNAKE, MH_NATURAL, -3,
+    M_COLD_BLOOD,
+    MR_RES_POISON,
+    400, 10, MONS_SNAKE, MONS_YELLOW_SNAKE, MH_NATURAL, -3,
     { 15, 0, 0, 0 },
     { 6, 3, 5, 0 },
     4, 14, 13, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_REPTILE, 
@@ -1904,7 +2070,8 @@
 {
     MONS_GREY_SNAKE, 'S', LIGHTGREY, "grey snake",
     M_COLD_BLOOD,
-    600, 10, MONS_GREY_SNAKE, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    600, 10, MONS_SNAKE, MONS_GREY_SNAKE, MH_NATURAL, -3,
     { 30, 0, 0, 0 },
     { 11, 3, 5, 0 },
     4, 16, 18, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, I_REPTILE, 
@@ -1914,8 +2081,9 @@
 
 {
     MONS_DEEP_TROLL, 'T', DARKGREY, "deep troll",
-    M_WARM_BLOOD | M_SEE_INVIS,
-    1500, 12, MONS_DEEP_TROLL, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_NO_FLAGS,
+    1500, 12, MONS_TROLL, MONS_DEEP_TROLL, MH_NATURAL, -3,
     { 27, 20, 20, 0 },
     { 10, 3, 5, 0 },
     6, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1925,8 +2093,9 @@
 
 {
     MONS_GIANT_BLOWFLY, 'y', LIGHTGREY, "giant blowfly",
-    M_ED_POISON | M_FLIES,
-    200, 10, MONS_GIANT_BLOWFLY, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    200, 10, MONS_GIANT_BLOWFLY, MONS_GIANT_BLOWFLY, MH_NATURAL, -3,
     { 13, 0, 0, 0 },
     { 5, 3, 5, 0 },
     2, 15, 19, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_BUZZ, I_PLANT, 
@@ -1936,8 +2105,9 @@
 
 {
     MONS_RED_WASP, 'y', RED, "red wasp",
-    M_ED_POISON | M_FLIES,
-    400, 14, MONS_RED_WASP, MH_NATURAL, -3,
+    M_FLIES,
+    MR_VUL_POISON,
+    400, 14, MONS_YELLOW_WASP, MONS_RED_WASP, MH_NATURAL, -3,
     { 23, 0, 0, 0 },
     { 8, 3, 5, 0 },
     7, 14, 15, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_BUZZ, I_PLANT, 
@@ -1947,9 +2117,10 @@
 
 {
     MONS_SWAMP_DRAGON, 'D', BROWN, "swamp dragon",
-    M_SPELLCASTER | M_FLIES | M_RES_POISON,
-    1900, 11, MONS_SWAMP_DRAGON, MH_NATURAL, -3,
-    { 13, 9, 9, 0 },
+    M_SPELLCASTER | M_FLIES,
+    MR_RES_POISON,
+    1900, 11, MONS_DRAGON, MONS_SWAMP_DRAGON, MH_NATURAL, -3,
+    { 18, 9, 9, 0 },
     { 9, 5, 5, 0 },
     7, 7, 10, 7, MST_SWAMP_DRAGON, CE_CONTAMINATED, Z_BIG, S_ROAR, I_ANIMAL_LIKE, 
     MONUSE_OPEN_DOORS
@@ -1957,10 +2128,11 @@
 ,
 
 {
-    MONS_SWAMP_DRAKE, 'd', BROWN, "swamp drake",
-    M_SPELLCASTER | M_FLIES | M_RES_POISON,
-    900, 11, MONS_SWAMP_DRAKE, MH_NATURAL, -3,
-    { 11, 0, 0, 0 },
+    MONS_SWAMP_DRAKE, 'l', BROWN, "swamp drake",
+    M_SPELLCASTER | M_FLIES | M_EVIL,
+    MR_RES_POISON,
+    900, 11, MONS_DRAGON, MONS_SWAMP_DRAKE, MH_NATURAL, -3,
+    { 14, 0, 0, 0 },
     { 4, 5, 5, 0 },
     3, 11, 11, 7, MST_SWAMP_DRAKE, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_ANIMAL_LIKE, 
     MONUSE_OPEN_DOORS
@@ -1968,9 +2140,22 @@
 ,
 
 {
+    MONS_DEATH_DRAKE, 'l', DARKGREY, "death drake",
+    M_SPELLCASTER | M_FLIES | M_EVIL,
+    MR_RES_POISON,
+    900, 11, MONS_DRAGON, MONS_DEATH_DRAKE, MH_NATURAL, -3,
+    { 12, 0, 0, 0 },
+    { 9, 5, 7, 0 },
+    6, 14, 13, 10, MST_DEATH_DRAKE, CE_HCL, Z_BIG, S_ROAR, I_ANIMAL_LIKE,
+    MONUSE_OPEN_DOORS
+}
+,
+
+{
     MONS_SOLDIER_ANT, 'a', LIGHTGREY, "soldier ant",
-    M_ED_POISON,
-    900, 10, MONS_SOLDIER_ANT, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    900, 10, MONS_GIANT_ANT, MONS_SOLDIER_ANT, MH_NATURAL, -3,
     { 14, 0, 0, 0 },
     { 6, 3, 5, 0 },
     8, 10, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -1980,8 +2165,9 @@
 
 {
     MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant",
-    M_WARM_BLOOD,
-    1600, 10, MONS_HILL_GIANT, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    1600, 10, MONS_HILL_GIANT, MONS_HILL_GIANT, MH_NATURAL, -3,
     { 30, 0, 0, 0 },
     { 11, 3, 5, 0 },
     3, 4, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, 
@@ -1991,8 +2177,9 @@
 
 {
     MONS_QUEEN_ANT, 'Q', DARKGREY, "queen ant",
-    M_ED_POISON,
-    1200, 10, MONS_QUEEN_ANT, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    1200, 10, MONS_GIANT_ANT, MONS_QUEEN_ANT, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 13, 3, 5, 0 },
     14, 3, 7, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -2002,8 +2189,9 @@
 
 {
     MONS_ANT_LARVA, 'w', LIGHTGREY, "ant larva",
-    M_ED_POISON | M_NO_SKELETON,
-    350, 5, MONS_ANT_LARVA, MH_NATURAL, -3,
+    M_NO_SKELETON,
+    MR_VUL_POISON,
+    350, 5, MONS_GIANT_ANT, MONS_ANT_LARVA, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 2, 3, 5, 0 },
     2, 6, 6, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, 
@@ -2015,7 +2203,8 @@
 {
     MONS_GIANT_FROG, 'F', GREEN, "giant frog",
     M_COLD_BLOOD | M_AMPHIBIOUS,
-    500, 10, MONS_GIANT_FROG, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    500, 10, MONS_GIANT_FROG, MONS_GIANT_FROG, MH_NATURAL, -3,
     { 9, 0, 0, 0 },
     { 4, 3, 5, 0 },
     0, 12, 15, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_CROAK, I_ANIMAL, 
@@ -2026,7 +2215,8 @@
 {
     MONS_GIANT_BROWN_FROG, 'F', BROWN, "giant brown frog",
     M_COLD_BLOOD | M_AMPHIBIOUS,
-    890, 10, MONS_GIANT_BROWN_FROG, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    890, 10, MONS_GIANT_FROG, MONS_GIANT_BROWN_FROG, MH_NATURAL, -3,
     { 14, 0, 0, 0 },
     { 8, 3, 5, 0 },
     2, 11, 13, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_CROAK, I_ANIMAL, 
@@ -2036,8 +2226,9 @@
 
 {
     MONS_SPINY_FROG, 'F', YELLOW, "spiny frog",
-    M_COLD_BLOOD | M_RES_POISON | M_AMPHIBIOUS,
-    1000, 10, MONS_SPINY_FROG, MH_NATURAL, -3,
+    M_COLD_BLOOD | M_AMPHIBIOUS,
+    MR_RES_POISON,
+    1000, 10, MONS_GIANT_FROG, MONS_SPINY_FROG, MH_NATURAL, -3,
     { 26, 0, 0, 0 },
     { 7, 3, 5, 0 },
     6, 9, 12, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_CROAK, I_ANIMAL, 
@@ -2047,8 +2238,9 @@
 
 {
     MONS_BLINK_FROG, 'F', LIGHTGREEN, "blink frog",
-    M_COLD_BLOOD | M_AMPHIBIOUS,
-    800, 12, MONS_BLINK_FROG, MH_NATURAL, -5,
+    M_COLD_BLOOD | M_AMPHIBIOUS | M_SPECIAL_ABILITY,
+    MR_NO_FLAGS,
+    800, 12, MONS_GIANT_FROG, MONS_BLINK_FROG, MH_NATURAL, -5,
     { 20, 0, 0, 0 },
     { 6, 3, 5, 0 },
     3, 12, 14, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_CROAK, I_ANIMAL, 
@@ -2058,7 +2250,8 @@
 {
     MONS_GIANT_COCKROACH, 'a', BROWN, "giant cockroach",
     M_NO_FLAGS,
-    250, 10, MONS_GIANT_COCKROACH, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    250, 10, MONS_GIANT_COCKROACH, MONS_GIANT_COCKROACH, MH_NATURAL, -1,
     { 2, 0, 0, 0 },
     { 1, 3, 4, 0 },
     3, 10, 12, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_INSECT, 
@@ -2068,7 +2261,8 @@
 {
     MONS_SMALL_SNAKE, 'S', LIGHTGREEN, "small snake",
     M_COLD_BLOOD,
-    100, 13, MONS_SMALL_SNAKE, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    100, 13, MONS_SNAKE, MONS_SMALL_SNAKE, MH_NATURAL, -1,
     { 2, 0, 0, 0 },
     { 1, 2, 3, 0 },
     0, 11, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_REPTILE, 
@@ -2078,8 +2272,9 @@
 
 {
     MONS_WHITE_IMP, '5', WHITE, "white imp",
-    M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SPEAKS,
-    0, 10, MONS_WHITE_IMP, MH_DEMONIC, -3,
+    M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL,
+    MR_RES_COLD,
+    0, 10, MONS_IMP, MONS_WHITE_IMP, MH_DEMONIC, -3,
     { 4, 0, 0, 0 },
     { 2, 3, 5, 0 },
     4, 10, 10, 7, MST_WHITE_IMP, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2089,8 +2284,9 @@
 
 {
     MONS_LEMURE, '5', YELLOW, "lemure",
-    M_RES_POISON,
-    0, 10, MONS_LEMURE, MH_DEMONIC, -3,
+    M_EVIL,
+    MR_RES_POISON,
+    0, 10, MONS_LEMURE, MONS_LEMURE, MH_DEMONIC, -3,
     { 12, 0, 0, 0 },
     { 2, 3, 5, 0 },
     1, 12, 12, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_NORMAL, 
@@ -2100,8 +2296,9 @@
 
 {
     MONS_UFETUBUS, '5', LIGHTCYAN, "ufetubus",
-    M_ED_FIRE | M_RES_COLD,
-    0, 10, MONS_UFETUBUS, MH_DEMONIC, -3,
+    M_EVIL,
+    MR_VUL_FIRE | MR_RES_COLD,
+    0, 10, MONS_UFETUBUS, MONS_UFETUBUS, MH_DEMONIC, -3,
     { 5, 5, 0, 0 },
     { 1, 4, 6, 0 },
     2, 15, 15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2111,8 +2308,9 @@
 
 {
     MONS_MANES, '5', LIGHTRED, "manes",
-    M_RES_ELEC | M_RES_FIRE | M_RES_COLD | M_RES_POISON,
-    0, 10, MONS_MANES, MH_DEMONIC, -3,
+    M_EVIL,
+    MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON,
+    0, 10, MONS_MANES, MONS_MANES, MH_DEMONIC, -3,
     { 5, 3, 3, 0 },
     { 3, 3, 5, 0 },
     2, 8, 8, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2122,8 +2320,9 @@
 
 {
     MONS_MIDGE, '5', LIGHTGREEN, "midge",
-    M_RES_POISON | M_FLIES,
-    0, 10, MONS_MIDGE, MH_DEMONIC, -3,
+    M_FLIES | M_EVIL,
+    MR_RES_POISON,
+    0, 10, MONS_MIDGE, MONS_MIDGE, MH_DEMONIC, -3,
     { 8, 0, 0, 0 },
     { 2, 3, 5, 0 },
     4, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2133,8 +2332,9 @@
 
 {
     MONS_NEQOXEC, '3', MAGENTA, "neqoxec",
-    M_RES_POISON | M_SPELLCASTER | M_LEVITATE,
-    0, 12, MONS_NEQOXEC, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_LEVITATE | M_EVIL,
+    MR_RES_POISON,
+    0, 12, MONS_NEQOXEC, MONS_NEQOXEC, MH_DEMONIC, -6,
     { 15, 0, 0, 0 },
     { 6, 3, 5, 0 },
     4, 12, 10, 7, MST_NEQOXEC, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2144,8 +2344,9 @@
 
 {
     MONS_ORANGE_DEMON, '3', LIGHTRED, "orange demon",
-    M_NO_FLAGS,
-    0, 12, MONS_ORANGE_DEMON, MH_DEMONIC, -6,
+    M_EVIL,
+    MR_NO_FLAGS,
+    0, 12, MONS_ORANGE_DEMON, MONS_ORANGE_DEMON, MH_DEMONIC, -6,
     { 10, 5, 0, 0 },
     { 8, 4, 5, 0 },
     3, 7, 7, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SCREECH, I_NORMAL, 
@@ -2155,8 +2356,9 @@
 
 {
     MONS_HELLWING, '3', LIGHTGREY, "hellwing",
-    M_RES_POISON | M_SPELLCASTER | M_FLIES,
-    0, 12, MONS_HELLWING, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_FLIES | M_EVIL,
+    MR_RES_POISON,
+    0, 12, MONS_HELLWING, MONS_HELLWING, MH_DEMONIC, -6,
     { 17, 10, 0, 0 },
     { 7, 4, 5, 0 },
     8, 10, 10, 7, MST_HELLWING, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_NORMAL, 
@@ -2166,8 +2368,9 @@
 
 {
     MONS_SMOKE_DEMON, '4', LIGHTGREY, "smoke demon",
-    M_RES_POISON | M_RES_FIRE | M_SPELLCASTER | M_FLIES,
-    0, 12, MONS_SMOKE_DEMON, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_FLIES | M_EVIL,
+    MR_RES_POISON | MR_RES_FIRE,
+    0, 12, MONS_SMOKE_DEMON, MONS_SMOKE_DEMON, MH_DEMONIC, -6,
     { 8, 5, 5, 0 },
     { 7, 3, 5, 0 },
     5, 9, 9, 7, MST_SMOKE_DEMON, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_NORMAL, 
@@ -2177,8 +2380,9 @@
 
 {
     MONS_YNOXINUL, '3', CYAN, "ynoxinul",
-    M_RES_ELEC | M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
-    0, 12, MONS_YNOXINUL, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD,
+    0, 12, MONS_YNOXINUL, MONS_YNOXINUL, MH_DEMONIC, -6,
     { 12, 0, 0, 0 },
     { 6, 3, 5, 0 },
     3, 10, 10, 7, MST_YNOXINUL, CE_CONTAMINATED, Z_NOZOMBIE, S_BELLOW, I_NORMAL, 
@@ -2188,8 +2392,9 @@
 
 {
     MONS_EXECUTIONER, '1', LIGHTGREY, "Executioner",
-    M_SPELLCASTER | M_RES_ELEC | M_RES_FIRE | M_RES_COLD | M_RES_POISON | M_SEE_INVIS,
-    0, 14, MONS_EXECUTIONER, MH_DEMONIC, -9,
+    M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON,
+    0, 14, MONS_EXECUTIONER, MONS_EXECUTIONER, MH_DEMONIC, -9,
     { 30, 10, 10, 0 },
     { 12, 3, 5, 0 },
     10, 15, 20, 7, MST_HELL_KNIGHT_I, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
@@ -2199,8 +2404,9 @@
 
 {
     MONS_GREEN_DEATH, '1', GREEN, "Green Death",
-    M_RES_POISON | M_SPELLCASTER | M_SEE_INVIS,
-    0, 14, MONS_GREEN_DEATH, MH_DEMONIC, -9,
+    M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON,
+    0, 14, MONS_GREEN_DEATH, MONS_GREEN_DEATH, MH_DEMONIC, -9,
     { 32, 0, 0, 0 },
     { 13, 3, 5, 0 },
     5, 7, 12, 7, MST_GREEN_DEATH, CE_POISONOUS, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -2210,8 +2416,9 @@
 
 {
     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,
-    0, 14, MONS_BLUE_DEATH, MH_DEMONIC, -9,
+    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, MONS_BLUE_DEATH, MH_DEMONIC, -9,
     { 20, 20, 0, 0 },
     { 12, 3, 5, 0 },
     10, 10, 12, 7, MST_BLUE_DEATH, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -2221,8 +2428,9 @@
 
 {
     MONS_BALRUG, '1', RED, "Balrug",
-    M_RES_POISON | M_RES_HELLFIRE | M_ED_COLD | M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
-    0, 14, MONS_BALRUG, MH_DEMONIC, -9,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD,
+    0, 14, MONS_BALRUG, MONS_BALRUG, MH_DEMONIC, -9,
     { 25, 0, 0, 0 },
     { 14, 3, 5, 0 },
     5, 12, 12, 7, MST_BALRUG, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -2232,8 +2440,9 @@
 
 {
     MONS_CACODEMON, '1', YELLOW, "Cacodemon",
-    M_RES_POISON | M_RES_ELEC | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS,
-    0, 14, MONS_CACODEMON, MH_DEMONIC, -9,
+    M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_ELEC,
+    0, 14, MONS_CACODEMON, MONS_CACODEMON, MH_DEMONIC, -9,
     { 22, 0, 0, 0 },
     { 13, 3, 5, 0 },
     11, 10, 10, 7, MST_CACODEMON, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -2244,8 +2453,9 @@
 
 {
     MONS_DEMONIC_CRAWLER, '3', DARKGREY, "demonic crawler",
-    M_RES_ELEC | M_RES_POISON | M_RES_COLD | M_RES_FIRE | M_SEE_INVIS,
-    0, 12, MONS_DEMONIC_CRAWLER, MH_DEMONIC, -6,
+    M_SEE_INVIS | M_EVIL,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE,
+    0, 12, MONS_DEMONIC_CRAWLER, MONS_DEMONIC_CRAWLER, MH_DEMONIC, -6,
     { 13, 13, 13, 13 },
     { 9, 3, 5, 0 },
     10, 6, 9, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_NORMAL, 
@@ -2255,8 +2465,9 @@
 
 {
     MONS_SUN_DEMON, '2', YELLOW, "sun demon",
-    M_RES_ELEC | M_RES_POISON | M_ED_COLD | M_RES_HELLFIRE | M_SEE_INVIS | M_LEVITATE,
-    0, 14, MONS_SUN_DEMON, MH_DEMONIC, -6,
+    M_SEE_INVIS | M_LEVITATE | M_EVIL,
+    MR_RES_ELEC | MR_RES_POISON | MR_VUL_COLD | MR_RES_HELLFIRE,
+    0, 14, MONS_SUN_DEMON, MONS_SUN_DEMON, MH_DEMONIC, -6,
     { 30, 0, 0, 0 },
     { 10, 3, 5, 0 },
     10, 12, 12, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2266,8 +2477,9 @@
 
 {
     MONS_SHADOW_IMP, '5', DARKGREY, "shadow imp",
-    M_RES_COLD | M_SPELLCASTER | M_FLIES | M_RES_POISON | M_SPEAKS,
-    0, 11, MONS_SHADOW_IMP, MH_DEMONIC, -3,
+    M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL,
+    MR_RES_COLD | MR_RES_POISON,
+    0, 11, MONS_IMP, MONS_SHADOW_IMP, MH_DEMONIC, -3,
     { 6, 0, 0, 0 },
     { 2, 3, 5, 0 },
     3, 11, 10, 7, MST_SHADOW_IMP, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2277,8 +2489,9 @@
 
 {
     MONS_SHADOW_DEMON, '3', DARKGREY, "shadow demon",
-    M_RES_POISON | M_RES_COLD | M_SEE_INVIS | M_INVIS,
-    0, 12, MONS_SHADOW_DEMON, MH_DEMONIC, -7,
+    M_SEE_INVIS | M_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 12, MONS_SHADOW_DEMON, MONS_SHADOW_DEMON, MH_DEMONIC, -7,
     { 21, 0, 0, 0 },
     { 6, 3, 5, 0 },
     7, 12, 11, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_CROAK, I_HIGH, 
@@ -2288,8 +2501,9 @@
 
 {
     MONS_LOROCYPROCA, '2', BLUE, "Lorocyproca",
-    M_RES_POISON | M_RES_COLD | M_RES_FIRE | M_RES_ELEC | M_SEE_INVIS | M_INVIS,
-    0, 12, MONS_LOROCYPROCA, MH_DEMONIC, -7,
+    M_SEE_INVIS | M_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE | MR_RES_ELEC,
+    0, 12, MONS_LOROCYPROCA, MONS_LOROCYPROCA, MH_DEMONIC, -7,
     { 25, 25, 0, 0 },
     { 12, 3, 5, 0 },
     10, 12, 9, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
@@ -2299,8 +2513,9 @@
 
 {
     MONS_SHADOW_WRAITH, 'W', BLUE, "shadow wraith",
-    M_RES_POISON | M_LEVITATE | M_SEE_INVIS | M_INVIS,
-    0, 15, MONS_SHADOW_WRAITH, MH_UNDEAD, -8,
+    M_LEVITATE | M_SEE_INVIS | M_INVIS | M_EVIL,
+    MR_RES_POISON,
+    0, 15, MONS_WRAITH, MONS_SHADOW_WRAITH, MH_UNDEAD, -8,
     { 20, 0, 0, 0 },
     { 10, 3, 5, 0 },
     7, 7, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_HIGH, 
@@ -2310,8 +2525,9 @@
 
 {
     MONS_GIANT_AMOEBA, 'J', BLUE, "giant amoeba",
-    M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS | M_AMPHIBIOUS,
-    1000, 10, MONS_GIANT_AMOEBA, MH_NATURAL, -3,
+    M_NO_SKELETON | M_SEE_INVIS | M_AMPHIBIOUS,
+    MR_RES_POISON,
+    1000, 10, MONS_GIANT_AMOEBA, MONS_GIANT_AMOEBA, MH_NATURAL, -3,
     { 25, 0, 0, 0 },
     { 12, 3, 5, 0 },
     0, 4, 10, 10, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2322,7 +2538,8 @@
 {
     MONS_GIANT_SLUG, 'm', GREEN, "giant slug",
     M_NO_SKELETON | M_AMPHIBIOUS,
-    700, 10, MONS_GIANT_SLUG, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    700, 10, MONS_GIANT_SLUG, MONS_GIANT_SLUG, MH_NATURAL, -3,
     { 23, 0, 0, 0 },
     { 10, 5, 3, 0 },
     0, 2, 6, 10, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -2333,7 +2550,8 @@
 {
     MONS_GIANT_SNAIL, 'm', LIGHTGREEN, "giant snail",
     M_NO_SKELETON | M_AMPHIBIOUS,
-    900, 10, MONS_GIANT_SNAIL, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    900, 10, MONS_GIANT_SLUG, MONS_GIANT_SNAIL, MH_NATURAL, -3,
     { 18, 0, 0, 0 },
     { 14, 5, 3, 0 },
     7, 2, 4, 10, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -2343,8 +2561,9 @@
 
 {
     MONS_SPATIAL_VORTEX, 'v', BLACK, "spatial vortex",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_LEVITATE | M_CONFUSED,
-    0, 5, MONS_SPATIAL_VORTEX, MH_NONLIVING, 5000,
+    M_LEVITATE | M_CONFUSED,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 5, MONS_FIRE_VORTEX, MONS_SPATIAL_VORTEX, MH_NONLIVING, MAG_IMMUNE,
     { 50, 0, 0, 0 },
     { 6, 6, 6, 0 },
     0, 5, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2354,8 +2573,9 @@
 
 {
     MONS_PIT_FIEND, '1', BROWN, "Pit Fiend",
-    M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_FLIES | M_SEE_INVIS | M_RES_ELEC,
-    0, 18, MONS_PIT_FIEND, MH_DEMONIC, -12,
+    M_FLIES | M_SEE_INVIS | M_EVIL | M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 18, MONS_FIEND, MONS_PIT_FIEND, MH_DEMONIC, -12,
     { 28, 21, 21, 0 },
     { 19, 4, 5, 0 },
     17, 5, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -2365,8 +2585,9 @@
 
 {
     MONS_BORING_BEETLE, 'B', BROWN, "boring beetle",
-    M_ED_POISON,
-    1300, 10, MONS_BORING_BEETLE, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_VUL_POISON,
+    1300, 10, MONS_GIANT_BEETLE, MONS_BORING_BEETLE, MH_NATURAL, -3,
     { 26, 0, 0, 0 },
     { 8, 3, 5, 0 },
     13, 4, 6, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, 
@@ -2376,8 +2597,9 @@
 
 {
     MONS_GARGOYLE, 'g', DARKGREY, "gargoyle",
-    M_RES_POISON | M_RES_ELEC | M_FLIES,
-    0, 12, MONS_GARGOYLE, MH_NONLIVING, -6,
+    M_FLIES,
+    MR_RES_POISON | MR_RES_ELEC,
+    0, 12, MONS_GARGOYLE, MONS_GARGOYLE, MH_NONLIVING, -6,
     { 10, 6, 6, 0 },
     { 4, 3, 5, 0 },
     18, 6, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -2388,8 +2610,9 @@
 // only appear in Dis castle
 {
     MONS_METAL_GARGOYLE, 'g', CYAN, "metal gargoyle",
-    M_RES_POISON | M_RES_ELEC | M_FLIES,
-    0, 12, MONS_METAL_GARGOYLE, MH_NONLIVING, -6,
+    M_FLIES,
+    MR_RES_POISON | MR_RES_ELEC,
+    0, 12, MONS_GARGOYLE, MONS_METAL_GARGOYLE, MH_NONLIVING, -6,
     { 19, 10, 10, 0 },
     { 8, 3, 5, 0 },
     20, 4, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -2400,8 +2623,9 @@
 // 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,
-    0, 12, MONS_MOLTEN_GARGOYLE, MH_NONLIVING, -6,
+    M_FLIES,
+    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE,
+    0, 12, MONS_GARGOYLE, MONS_MOLTEN_GARGOYLE, MH_NONLIVING, -6,
     { 12, 8, 8, 0 },
     { 5, 3, 5, 0 },
     14, 7, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -2415,8 +2639,9 @@
 
 {
     MONS_MNOLEG, '&', LIGHTGREEN, "Mnoleg",
-    M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS,
-    0, 25, MONS_MNOLEG, MH_DEMONIC, 5000,
+    M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE,
+    0, 25, MONS_MNOLEG, MONS_MNOLEG, MH_DEMONIC, MAG_IMMUNE,
     { 23, 23, 0, 0 },
     { 17, 0, 0, 199 },
     10, 13, 13, 7, MST_MNOLEG, CE_CONTAMINATED, Z_NOZOMBIE, S_BUZZ, I_HIGH, 
@@ -2426,8 +2651,9 @@
 
 {
     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,
-    0, 25, MONS_LOM_LOBON, MH_DEMONIC, 5000,
+    M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 25, MONS_LOM_LOBON, MONS_LOM_LOBON, MH_DEMONIC, MAG_IMMUNE,
     { 40, 0, 0, 0 },
     { 19, 0, 0, 223 },
     10, 7, 8, 7, MST_LOM_LOBON, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_HIGH, 
@@ -2437,8 +2663,9 @@
 
 {
     MONS_CEREBOV, '&', RED, "Cerebov",
-    M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS,
-    0, 25, MONS_CEREBOV, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE,
+    0, 25, MONS_CEREBOV, MONS_CEREBOV, MH_DEMONIC, -6,
     { 50, 0, 0, 0 },
     { 21, 0, 0, 253 },
     15, 8, 10, 7, MST_CEREBOV, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -2448,8 +2675,9 @@
 
 {
     MONS_GLOORX_VLOQ, '&', DARKGREY, "Gloorx Vloq",
-    M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS,
-    0, 25, MONS_GLOORX_VLOQ, MH_DEMONIC, -14,
+    M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
+    0, 25, MONS_GLOORX_VLOQ, MONS_GLOORX_VLOQ, MH_DEMONIC, -14,
     { 20, 0, 0, 0 },
     { 16, 0, 0, 234 },
     10, 10, 10, 7, MST_GLOORX_VLOQ, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_HIGH, 
@@ -2458,16 +2686,18 @@
 ,
 
 /* ******************************************************************
-{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,
-    750, 13, MONS_NAGA, MH_NATURAL, -6,
-    { 5, 0, 0, 0 },
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD,
+    MR_RES_POISON,
+    750, 13, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6,
+    { 10, 0, 0, 0 },
     { 7, 3, 5, 0 },
     6, 10, 8, 7, MST_NAGA_MAGE, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
     MONUSE_WEAPONS_ARMOUR
@@ -2476,9 +2706,10 @@
 
 {
     MONS_NAGA_WARRIOR, 'N', BLUE, "naga warrior",
-    M_RES_POISON | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD,
-    750, 12, MONS_NAGA, MH_NATURAL, -6,
-    { 11, 0, 0, 0 },
+    M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD,
+    MR_RES_POISON,
+    750, 12, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6,
+    { 20, 0, 0, 0 },
     { 10, 5, 5, 0 },
     6, 10, 8, 7, MST_NAGA, CE_POISONOUS, Z_SMALL, S_SHOUT, I_NORMAL, 
     MONUSE_WEAPONS_ARMOUR
@@ -2487,8 +2718,9 @@
 
 {
     MONS_ORC_WARLORD, 'o', RED, "orc warlord",
-    M_WARM_BLOOD,
-    600, 15, MONS_ORC, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_EVIL,
+    MR_NO_FLAGS,
+    600, 15, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
     { 32, 0, 0, 0 },
     { 15, 4, 7, 0 },
     3, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2499,7 +2731,8 @@
 {
     MONS_DEEP_ELF_SOLDIER, 'e', CYAN, "deep elf soldier",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 6, 0, 0, 0 },
     { 3, 3, 3, 0 },
     0, 12, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2510,7 +2743,8 @@
 {
     MONS_DEEP_ELF_FIGHTER, 'e', LIGHTBLUE, "deep elf fighter",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 9, 0, 0, 0 },
     { 6, 3, 3, 0 },
     0, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2521,7 +2755,8 @@
 {
     MONS_DEEP_ELF_KNIGHT, 'e', BLUE, "deep elf knight",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 14, 0, 0, 0 },
     { 11, 3, 3, 0 },
     0, 15, 11, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2531,8 +2766,9 @@
 
 {
     MONS_DEEP_ELF_MAGE, 'e', LIGHTRED, "deep elf mage",
-    M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
+    MR_RES_ELEC,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 5, 0, 0, 0 },
     { 4, 3, 3, 0 },
     0, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2543,7 +2779,8 @@
 {
     MONS_DEEP_ELF_SUMMONER, 'e', YELLOW, "deep elf summoner",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 5, 0, 0, 0 },
     { 6, 3, 3, 0 },
     0, 13, 10, 7, MST_DEEP_ELF_SUMMONER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2553,8 +2790,9 @@
 
 {
     MONS_DEEP_ELF_CONJURER, 'e', LIGHTGREEN, "deep elf conjurer",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_RES_ELEC | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
+    MR_RES_ELEC,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 5, 0, 0, 0 },
     { 6, 3, 3, 0 },
     0, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2565,7 +2803,8 @@
 {
     MONS_DEEP_ELF_PRIEST, 'e', LIGHTGREY, "deep elf priest",
     M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 9, 0, 0, 0 },
     { 5, 3, 3, 0 },
     0, 13, 10, 7, MST_DEEP_ELF_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2575,8 +2814,9 @@
 
 {
     MONS_DEEP_ELF_HIGH_PRIEST, 'e', DARKGREY, "deep elf high priest",
-    M_SPELLCASTER | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_SEE_INVIS,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    M_SPELLCASTER | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 14, 0, 0, 0 },
     { 11, 3, 3, 0 },
     3, 13, 10, 7, MST_DEEP_ELF_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2586,8 +2826,9 @@
 
 {
     MONS_DEEP_ELF_DEMONOLOGIST, 'e', MAGENTA, "deep elf demonologist",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 12, 0, 0, 0 },
     { 12, 3, 3, 0 },
     0, 13, 10, 7, MST_DEEP_ELF_DEMONOLOGIST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2597,8 +2838,9 @@
 
 {
     MONS_DEEP_ELF_ANNIHILATOR, 'e', GREEN, "deep elf annihilator",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_RES_ELEC | M_SEE_INVIS,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS,
+    MR_RES_ELEC,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 12, 0, 0, 0 },
     { 15, 3, 3, 0 },
     0, 13, 10, 7, MST_DEEP_ELF_ANNIHILATOR, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2609,7 +2851,8 @@
 {
     MONS_DEEP_ELF_SORCERER, 'e', RED, "deep elf sorcerer",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 12, 0, 0, 0 },
     { 14, 3, 3, 0 },
     0, 13, 10, 7, MST_DEEP_ELF_SORCERER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2619,8 +2862,9 @@
 
 {
     MONS_DEEP_ELF_DEATH_MAGE, 'e', WHITE, "deep elf death mage",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS,
-    450, 10, MONS_ELF, MH_NATURAL, -6,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL,
+    MR_NO_FLAGS,
+    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { 12, 0, 0, 0 },
     { 15, 3, 3, 0 },
     0, 13, 10, 7, MST_DEEP_ELF_DEATH_MAGE, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -2630,8 +2874,9 @@
 
 {
     MONS_BROWN_OOZE, 'J', BROWN, "brown ooze",
-    M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS,
-    0, 11, MONS_BROWN_OOZE, MH_NATURAL, -7,
+    M_NO_SKELETON | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 11, MONS_JELLY, MONS_BROWN_OOZE, MH_NATURAL, -7,
     { 25, 0, 0, 0 },
     { 7, 3, 5, 0 },
     10, 1, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2641,8 +2886,9 @@
 
 {
     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,
-    0, 11, MONS_AZURE_JELLY, MH_NATURAL, -4,
+    M_NO_SKELETON | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_COLD | MR_VUL_FIRE | MR_RES_ELEC | MR_RES_ASPHYX,
+    0, 11, MONS_JELLY, MONS_AZURE_JELLY, MH_NATURAL, -4,
     { 12, 12, 12, 12 },
     { 15, 3, 5, 0 },
     5, 10, 12, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2652,8 +2898,9 @@
 
 {
     MONS_DEATH_OOZE, 'J', DARKGREY, "death ooze",
-    M_RES_POISON | M_RES_COLD | M_NO_SKELETON | M_SEE_INVIS,
-    0, 13, MONS_DEATH_OOZE, MH_UNDEAD, -8,
+    M_NO_SKELETON | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ASPHYX,
+    0, 13, MONS_JELLY, MONS_DEATH_OOZE, MH_UNDEAD, -8,
     { 32, 32, 0, 0 },
     { 11, 3, 3, 0 },
     2, 4, 12, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2663,8 +2910,9 @@
 
 {
     MONS_ACID_BLOB, 'J', LIGHTGREEN, "acid blob",
-    M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS,
-    0, 12, MONS_ACID_BLOB, MH_NATURAL, -7,
+    M_NO_SKELETON | M_SEE_INVIS | M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 12, MONS_JELLY, MONS_ACID_BLOB, MH_NATURAL, -7,
     { 42, 0, 0, 0 },
     { 18, 3, 5, 0 },
     1, 3, 14, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2674,8 +2922,9 @@
 
 {
     MONS_ROYAL_JELLY, 'J', YELLOW, "royal jelly",
-    M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS,
-    0, 20, MONS_ROYAL_JELLY, MH_NATURAL, -7,
+    M_NO_SKELETON | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 20, MONS_JELLY, MONS_ROYAL_JELLY, MH_NATURAL, -7,
     { 50, 0, 0, 0 },
     { 21, 0, 0, 111 },
     8, 4, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -2685,8 +2934,9 @@
 
 {
     MONS_TERENCE, '@', LIGHTCYAN, "Terence",
-    M_WARM_BLOOD| M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { 3, 0, 0, 0 },
     { 1, 0, 0, 14 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2696,8 +2946,9 @@
 
 {
     MONS_JESSICA, '@', LIGHTGREY, "Jessica",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -3,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { 4, 0, 0, 0 },
     { 1, 0, 0, 10 },
     0, 10, 10, 7, MST_ORC_WIZARD_I, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2707,8 +2958,9 @@
 
 {
     MONS_IJYB, 'g', BLUE, "Ijyb",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 5, MONS_GOBLIN, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 5, MONS_GOBLIN, MONS_GOBLIN, MH_NATURAL, -3,
     { 4, 0, 0, 0 },
     { 3, 0, 0, 28 },
     2, 12, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2718,8 +2970,9 @@
 
 {
     MONS_SIGMUND, '@', YELLOW, "Sigmund",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -3,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 3, 0, 0, 25 },
     0, 11, 10, 7, MST_ORC_WIZARD_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2729,8 +2982,9 @@
 
 {
     MONS_BLORK_THE_ORC, 'o', BROWN, "Blork the orc",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_ORC, MH_NATURAL, -4,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_ORC, MONS_ORC, MH_NATURAL, -4,
     { 7, 0, 0, 0 },
     { 3, 0, 0, 32 },
     0, 9, 8, 7, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2740,8 +2994,9 @@
 
 {
     MONS_EDMUND, '@', RED, "Edmund",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -4,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
     { 6, 0, 0, 0 },
     { 4, 0, 0, 27 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2751,8 +3006,9 @@
 
 {
     MONS_PSYCHE, '@', LIGHTMAGENTA, "Psyche",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -4,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -4,
     { 7, 0, 0, 0 },
     { 5, 0, 0, 24 },
     0, 12, 13, 7, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2762,8 +3018,10 @@
 
 {
     MONS_EROLCHA, 'O', LIGHTBLUE, "Erolcha",
-    M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_OGRE, MH_NATURAL, -7,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD 
+        | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_ELEC,
+    0, 20, MONS_OGRE, MONS_OGRE, MH_NATURAL, -7,
     { 20, 0, 0, 0 },
     { 6, 0, 0, 45 },
     3, 7, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2773,8 +3031,9 @@
 
 {
     MONS_DONALD, '@', BLUE, "Donald",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 8, 0, 0, 0 },
     { 5, 0, 0, 33 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2784,8 +3043,9 @@
 
 {
     MONS_URUG, 'o', RED, "Urug",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_ORC, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_ORC, MONS_ORC, MH_NATURAL, -5,
     { 12, 0, 0, 0 },
     { 6, 0, 0, 38 },
     0, 11, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2795,8 +3055,9 @@
 
 {
     MONS_MICHAEL, '@', LIGHTGREY, "Michael",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 9, 0, 0, 0 },
     { 6, 0, 0, 36 },
     0, 10, 10, 7, MST_ORC_WIZARD_III, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2806,8 +3067,9 @@
 
 {
     MONS_JOSEPH, '@', CYAN, "Joseph",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 9, 0, 0, 0 },
     { 7, 0, 0, 42 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2817,8 +3079,9 @@
 
 {
     MONS_SNORG, 'T', GREEN, "Snorg",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_TROLL, MH_NATURAL, -6,
+    M_WARM_BLOOD | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_TROLL, MONS_TROLL, MH_NATURAL, -6,
     { 20, 15, 15, 0 },
     { 8, 0, 0, 45 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2828,8 +3091,9 @@
 
 {
     MONS_ERICA, '@', MAGENTA, "Erica",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 10, 0, 0, 0 },
     { 9, 0, 0, 43 },
     0, 11, 11, 7, MST_WIZARD_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2839,8 +3103,9 @@
 
 {
     MONS_JOSEPHINE, '@', WHITE, "Josephine",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 11, 0, 0, 0 },
     { 9, 0, 0, 47 },
     0, 10, 10, 7, MST_NECROMANCER_I, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2850,8 +3115,9 @@
 
 {
     MONS_HAROLD, '@', LIGHTGREEN, "Harold",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 12, 0, 0, 0 },
     { 9, 0, 0, 51 },
     0, 8, 10, 7, MST_HELL_KNIGHT_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2861,8 +3127,9 @@
 
 {
     MONS_NORBERT, '@', BROWN, "Norbert",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 14, 0, 0, 0 },
     { 10, 0, 0, 53 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2872,8 +3139,9 @@
 
 {
     MONS_JOZEF, '@', LIGHTMAGENTA, "Jozef",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 14, 0, 0, 0 },
     { 11, 0, 0, 60 },
     0, 9, 10, 7, MST_GUARDIAN_NAGA, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2883,8 +3151,9 @@
 
 {
     MONS_AGNES, '@', LIGHTBLUE, "Agnes",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 11, 0, 0, 0 },
     { 11, 0, 0, 64 },
     0, 10, 15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2894,8 +3163,9 @@
 
 {
     MONS_MAUD, '@', RED, "Maud",
-    M_WARM_BLOOD | M_SPEAKS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_WARM_BLOOD | M_SPEAKS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 14, 0, 0, 0 },
     { 13, 0, 0, 55 },
     0, 10, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2905,8 +3175,9 @@
 
 {
     MONS_LOUISE, '@', BLUE, "Louise",
-    M_SPELLCASTER | M_RES_ELEC | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_UNIQUE,
+    MR_RES_ELEC,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 12, 0, 0, 0 },
     { 13, 0, 0, 52 },
     0, 10, 10, 7, MST_WIZARD_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2916,8 +3187,10 @@
 
 {
     MONS_FRANCIS, '@', YELLOW, "Francis",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_EVIL | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 12, 0, 0, 0 },
     { 14, 0, 0, 67 },
     0, 10, 10, 7, MST_ORC_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2927,8 +3200,10 @@
 
 {
     MONS_FRANCES, '@', YELLOW, "Frances",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_EVIL | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 11, 0, 0, 0 },
     { 14, 0, 0, 70 },
     0, 10, 10, 7, MST_ORC_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2938,8 +3213,10 @@
 
 {
     MONS_RUPERT, '@', RED, "Rupert",
-    M_SPELLCASTER | M_RES_ELEC | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_UNIQUE,
+    MR_RES_ELEC,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 13, 0, 0, 0 },
     { 16, 0, 0, 80 },
     0, 10, 10, 7, MST_WIZARD_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2949,8 +3226,10 @@
 
 {
     MONS_WAYNE, '@', YELLOW, "Wayne",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 14, 0, 0, 0 },
     { 17, 0, 0, 78 },
     1, 10, 7, 7, MST_ORC_PRIEST, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2960,8 +3239,10 @@
 
 {
     MONS_DUANE, '@', YELLOW, "Duane",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 14, 0, 0, 0 },
     { 18, 0, 0, 83 },
     0, 10, 10, 7, MST_ORC_WIZARD_I, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -2971,8 +3252,9 @@
 
 {
     MONS_XTAHUA, 'D', RED, "Xtahua",
-    M_SPEAKS | M_SEE_INVIS | M_RES_POISON | M_RES_FIRE | M_ED_COLD | M_FLIES,
-    0, 20, MONS_DRAGON, MH_NATURAL, -7,
+    M_SPEAKS | M_SEE_INVIS | M_FLIES | M_SPECIAL_ABILITY | M_UNIQUE,
+    MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD,
+    0, 20, MONS_DRAGON, MONS_DRAGON, MH_NATURAL, -7,
     { 29, 17, 17, 0 },
     { 19, 0, 0, 133 },
     15, 7, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_NORMAL, 
@@ -2982,19 +3264,23 @@
 
 {
     MONS_NORRIS, '@', LIGHTRED, "Norris",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_EVIL | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 16, 0, 0, 0 },
     { 20, 0, 0, 95 },
-    1, 9, 9, 7, MST_HELL_KNIGHT_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
+    1, 9, 9, 7, MST_MYSTIC, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
     MONUSE_WEAPONS_ARMOUR
 }
 ,
 
 {
     MONS_ADOLF, '@', DARKGREY, "Adolf",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD
+        | M_SEE_INVIS | M_EVIL | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 17, 0, 0, 0 },
     { 21, 0, 0, 105 },
     0, 10, 10, 7, MST_LICH_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -3004,8 +3290,10 @@
 
 {
     MONS_MARGERY, '@', RED, "Margery",
-    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS,
-    0, 20, MONS_HUMAN, MH_NATURAL, -5,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD 
+        | M_SEE_INVIS | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { 18, 0, 0, 0 },
     { 22, 0, 0, 119 },
     0, 10, 10, 7, MST_EFREET, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -3015,8 +3303,10 @@
 
 {
     MONS_BORIS, 'L', RED, "Boris",
-    M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_SPEAKS,
-    0, 23, MONS_LICH, MH_UNDEAD, -11,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_SPEAKS | M_EVIL
+        | M_UNIQUE,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
+    0, 23, MONS_LICH, MONS_LICH, MH_UNDEAD, -11,
     { 15, 0, 0, 0 },
     { 22, 0, 0, 99 },
     12, 10, 10, 7, MST_LICH_IV, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -3027,8 +3317,9 @@
 
 {
     MONS_GERYON, '&', GREEN, "Geryon",
-    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS,
-    0, 25, MONS_GERYON, MH_DEMONIC, -6,
+    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_NO_FLAGS,
+    0, 25, MONS_GERYON, MONS_GERYON, MH_DEMONIC, -6,
     { 30, 0, 0, 0 },
     { 15, 0, 0, 240 },
     15, 6, 10, 7, MST_GERYON, CE_CONTAMINATED, Z_NOZOMBIE, S_ROAR, I_NORMAL, 
@@ -3038,8 +3329,9 @@
 
 {
     MONS_DISPATER, '&', MAGENTA, "Dispater",
-    M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS,
-    0, 25, MONS_DISPATER, MH_DEMONIC, -10,
+    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
+    0, 25, MONS_DISPATER, MONS_DISPATER, MH_DEMONIC, -10,
     { 15, 0, 0, 0 },
     { 16, 0, 0, 222 },
     15, 3, 6, 7, MST_DISPATER, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3049,8 +3341,9 @@
 
 {
     MONS_ASMODEUS, '&', LIGHTMAGENTA, "Asmodeus",
-    M_RES_ELEC | M_RES_POISON | M_RES_HELLFIRE | M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_SPEAKS,
-    0, 25, MONS_ASMODEUS, MH_DEMONIC, -12,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE,
+    0, 25, MONS_ASMODEUS, MONS_ASMODEUS, MH_DEMONIC, -12,
     { 20, 0, 0, 0 },
     { 17, 0, 0, 245 },
     12, 7, 9, 7, MST_ASMODEUS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3061,8 +3354,9 @@
 // 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,
-    0, 25, MONS_ANTAEUS, MH_DEMONIC, -9,
+    M_SPELLCASTER | M_SPEAKS | M_UNIQUE,
+    MR_RES_ELEC | MR_VUL_FIRE | MR_RES_COLD,
+    0, 25, MONS_HILL_GIANT, MONS_ANTAEUS, MH_DEMONIC, -9,
     { 30, 0, 0, 0 },
     { 22, 0, 0, 250 },
     10, 4, 7, 7, MST_ANTAEUS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3072,8 +3366,9 @@
 
 {
     MONS_ERESHKIGAL, '&', WHITE, "Ereshkigal",
-    M_RES_ELEC | M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS,
-    0, 25, MONS_ERESHKIGAL, MH_DEMONIC, -10,
+    M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD,
+    0, 25, MONS_ERESHKIGAL, MONS_ERESHKIGAL, MH_DEMONIC, -10,
     { 20, 0, 0, 0 },
     { 18, 0, 0, 238 },
     15, 6, 9, 7, MST_ERESHKIGAL, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3083,8 +3378,9 @@
 
 {
     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,
-    0, 20, MONS_LICH, MH_UNDEAD, -14,
+    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, MONS_LICH, MH_UNDEAD, -14,
     { 20, 0, 0, 0 },
     { 27, 2, 4, 0 },
     20, 10, 12, 7, MST_LICH_I, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3095,8 +3391,9 @@
 
 {
     MONS_OOZE, 'J', LIGHTGREY, "ooze",
-    M_RES_POISON | M_NO_SKELETON | M_SEE_INVIS,
-    0, 5, MONS_OOZE, MH_NATURAL, -6,
+    M_NO_SKELETON | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_ASPHYX,
+    0, 5, MONS_JELLY, MONS_OOZE, MH_NATURAL, -6,
     { 5, 0, 0, 0 },
     { 3, 3, 5, 0 },
     1, 3, 8, 7, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3107,7 +3404,8 @@
 {
     MONS_VAULT_GUARD, '@', CYAN, "vault guard",
     M_WARM_BLOOD | M_SEE_INVIS,
-    0, 12, MONS_HUMAN, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 13, 3, 5, 0 },
     1, 13, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -3119,8 +3417,9 @@
    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,
-    0, 50, MONS_CURSE_SKULL, MH_UNDEAD, 5000,
+    M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
+    0, 50, MONS_LICH, MONS_CURSE_SKULL, MH_UNDEAD, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 13, 0, 0, 66 },
     40, 3, 10, 7, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
@@ -3130,8 +3429,9 @@
 
 {
     MONS_VAMPIRE_KNIGHT, 'V', CYAN, "vampire knight",
-    M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS,
-    0, 13, MONS_VAMPIRE, MH_UNDEAD, -6,
+    M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 13, MONS_VAMPIRE, MONS_VAMPIRE, MH_UNDEAD, -6,
     { 33, 0, 0, 0 },
     { 11, 3, 7, 0 },
     10, 10, 10, 7, MST_VAMPIRE_KNIGHT, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3141,8 +3441,9 @@
 
 {
     MONS_VAMPIRE_MAGE, 'V', MAGENTA, "vampire mage",
-    M_RES_POISON | M_RES_COLD | M_SPELLCASTER | M_SEE_INVIS | M_FLIES,
-    0, 15, MONS_VAMPIRE, MH_UNDEAD, -6,
+    M_SPELLCASTER | M_SEE_INVIS | M_FLIES | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 15, MONS_VAMPIRE, MONS_VAMPIRE, MH_UNDEAD, -6,
     { 22, 0, 0, 0 },
     { 8, 3, 4, 0 },
     10, 10, 10, 7, MST_VAMPIRE_MAGE, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -3153,7 +3454,8 @@
 {
     MONS_SHINING_EYE, 'G', LIGHTMAGENTA, "shining eye",
     M_NO_SKELETON | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS,
-    0, 14, MONS_SHINING_EYE, MH_NATURAL, 5000,
+    MR_RES_ASPHYX,
+    0, 14, MONS_SHINING_EYE, MONS_SHINING_EYE, MH_NATURAL, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 10, 3, 5, 0 },
     3, 1, 7, 7, MST_SHINING_EYE, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3164,8 +3466,9 @@
 {
     MONS_ORB_GUARDIAN, 'X', MAGENTA, "Orb Guardian",
     M_NO_SKELETON | M_SEE_INVIS,
-    0, 20, MONS_ORB_GUARDIAN, MH_NATURAL, -6,
-    { 40, 0, 0, 0 },
+    MR_NO_FLAGS,
+    0, 20, MONS_ORB_GUARDIAN, MONS_ORB_GUARDIAN, MH_NATURAL, -6,
+    { 45, 0, 0, 0 },
     { 15, 3, 5, 0 },
     13, 13, 14, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
     MONUSE_OPEN_DOORS
@@ -3174,8 +3477,9 @@
 
 {
     MONS_DAEVA, 'A', YELLOW, "Daeva",
-    M_RES_POISON | M_LEVITATE | M_SPELLCASTER,
-    0, 12, MONS_DAEVA, MH_HOLY, -8,
+    M_LEVITATE | M_SPELLCASTER,
+    MR_RES_POISON,
+    0, 12, MONS_ANGEL, MONS_DAEVA, MH_HOLY, -8,
     { 25, 0, 0, 0 },
     { 12, 3, 5, 0 },
     10, 13, 13, 7, MST_DAEVA, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3186,8 +3490,9 @@
 /* spectral thing - similar to zombies/skeletons */
 {
     MONS_SPECTRAL_THING, 'W', GREEN, "",
-    M_RES_POISON | M_RES_COLD | M_LEVITATE | M_SEE_INVIS,
-    0, 11, MONS_SPECTRAL_THING, MH_UNDEAD, 5000,
+    M_LEVITATE | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 11, MONS_WRAITH, MONS_SPECTRAL_THING, MH_UNDEAD, MAG_IMMUNE,
     { 20, 0, 0, 0 },
     { 8, 3, 5, 0 },
     8, 5, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3197,9 +3502,10 @@
 
 {
     MONS_GREATER_NAGA, 'N', RED, "greater naga",
-    M_RES_POISON | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD,
-    750, 10, MONS_NAGA, MH_NATURAL, 5000,
-    { 18, 0, 0, 0 },
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD,
+    MR_RES_POISON,
+    750, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, MAG_IMMUNE,
+    { 24, 0, 0, 0 },
     { 15, 3, 5, 0 },
     6, 10, 8, 7, MST_NAGA_MAGE, CE_POISONOUS, Z_SMALL, S_SHOUT, I_HIGH, 
     MONUSE_WEAPONS_ARMOUR
@@ -3208,8 +3514,9 @@
 
 {
     MONS_SKELETAL_DRAGON, 'D', LIGHTGREY, "skeletal dragon",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS,
-    0, 12, MONS_SKELETAL_DRAGON, MH_UNDEAD, -4,
+    M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 12, MONS_SKELETAL_WARRIOR, MONS_SKELETAL_DRAGON, MH_UNDEAD, -4,
     { 30, 20, 20, 0 },
     { 20, 8, 8, 0 },
     20, 4, 8, 7, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3219,8 +3526,9 @@
 
 {
     MONS_TENTACLED_MONSTROSITY, 'X', GREEN, "tentacled monstrosity",
-    M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_RES_ELEC | M_SEE_INVIS | M_AMPHIBIOUS,
-    0, 10, MONS_TENTACLED_MONSTROSITY, MH_NATURAL, -5,
+    M_SEE_INVIS | M_AMPHIBIOUS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_TENTACLED_MONSTROSITY, MONS_TENTACLED_MONSTROSITY, MH_NATURAL, -5,
     { 22, 17, 13, 19 },
     { 25, 3, 5, 0 },
     5, 5, 9, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3231,7 +3539,8 @@
 {
     MONS_SPHINX, 'H', LIGHTGREY, "sphinx",
     M_FLIES | M_SEE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD,
-    0, 10, MONS_SPHINX, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 10, MONS_SPHINX, MONS_SPHINX, MH_NATURAL, -3,
     { 25, 12, 12, 0 },
     { 16, 3, 5, 0 },
     5, 5, 13, 7, MST_SPHINX, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_HIGH, 
@@ -3241,8 +3550,9 @@
 
 {
     MONS_ROTTING_HULK, 'n', BROWN, "rotting hulk",
-    M_RES_POISON | M_RES_COLD,
-    0, 12, MONS_ROTTING_HULK, MH_UNDEAD, -5,
+    M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 12, MONS_GHOUL, MONS_ROTTING_HULK, MH_UNDEAD, -5,
     { 25, 0, 0, 0 },
     { 10, 3, 5, 0 },
     5, 7, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3252,8 +3562,9 @@
 
 {
     MONS_GUARDIAN_MUMMY, 'M', YELLOW, "guardian mummy",
-    M_RES_POISON | M_RES_COLD | M_SEE_INVIS,
-    0, 13, MONS_GUARDIAN_MUMMY, MH_UNDEAD, -5,
+    M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 13, MONS_MUMMY, MONS_GUARDIAN_MUMMY, MH_UNDEAD, -5,
     { 30, 0, 0, 0 },
     { 7, 5, 3, 0 },
     6, 9, 9, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3263,8 +3574,9 @@
 
 {
     MONS_GREATER_MUMMY, 'M', DARKGREY, "greater mummy",
-    M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS,
-    0, 20, MONS_MUMMY, MH_UNDEAD, 5000,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
+    0, 20, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, MAG_IMMUNE,
     { 35, 0, 0, 0 },
     { 15, 5, 3, 100 },
     10, 6, 10, 7, MST_MUMMY, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3274,8 +3586,9 @@
 
 {
     MONS_MUMMY_PRIEST, 'M', RED, "mummy priest",
-    M_RES_POISON | M_RES_COLD | M_RES_ELEC | M_SPELLCASTER | M_PRIEST | M_SEE_INVIS,
-    0, 16, MONS_MUMMY, MH_UNDEAD, 5000,
+    M_SPELLCASTER | M_PRIEST | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC,
+    0, 16, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, MAG_IMMUNE,
     { 30, 0, 0, 0 },
     { 10, 5, 3, 0 },
     8, 7, 9, 7, MST_MUMMY, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3286,7 +3599,8 @@
 {
     MONS_CENTAUR_WARRIOR, 'c', YELLOW, "centaur warrior",
     M_WARM_BLOOD,
-    1500, 12, MONS_CENTAUR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1500, 12, MONS_CENTAUR, MONS_CENTAUR, MH_NATURAL, -3,
     { 16, 0, 0, 0 },
     { 9, 3, 5, 0 },
     4, 8, 15, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
@@ -3297,7 +3611,8 @@
 {
     MONS_YAKTAUR_CAPTAIN, 'c', RED, "yaktaur captain",
     M_WARM_BLOOD,
-    2000, 10, MONS_YAKTAUR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    2000, 10, MONS_YAKTAUR, MONS_YAKTAUR, MH_NATURAL, -3,
     { 23, 0, 0, 0 },
     { 14, 3, 5, 0 },
     5, 5, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, 
@@ -3305,10 +3620,205 @@
 }
 ,
 
+{   // Base draconian -- for use like MONS_HUMAN, MONS_ELF although we 
+    // now store the draconian subspecies in the high byte of mon->number
+    // for those listed as species MONS_DRACONIAN.
+    MONS_DRACONIAN, 'd', BROWN, "draconian",
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -1,
+    { 15, 0, 0, 0 },
+    { 3, 6, 4, 0 },
+    7, 8, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_BLACK_DRACONIAN, 'd', DARKGREY, "black draconian",
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_RES_ELEC,
+    900, 10, MONS_DRACONIAN, MONS_BLACK_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 10, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{ 
+    MONS_YELLOW_DRACONIAN, 'd', YELLOW, "yellow draconian", 
+    M_FLIES | M_HUMANOID | M_COLD_BLOOD | M_SPECIAL_ABILITY,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_YELLOW_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 10, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_PALE_DRACONIAN, 'd', LIGHTGREY, "pale draconian", 
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_RES_FIRE, 
+    900, 10, MONS_DRACONIAN, MONS_PALE_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 14, 12, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_GREEN_DRACONIAN, 'd', LIGHTGREEN, "green draconian", 
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_RES_POISON,
+    900, 10, MONS_DRACONIAN, MONS_GREEN_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 10, 10, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_PURPLE_DRACONIAN, 'd', MAGENTA, "purple draconian", 
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_PURPLE_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    8, 10, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{ 
+    MONS_RED_DRACONIAN, 'd', RED, "red draconian", 
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD | M_SPECIAL_ABILITY,
+    MR_RES_FIRE,
+    900, 10, MONS_DRACONIAN, MONS_RED_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 10, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{ 
+    MONS_WHITE_DRACONIAN, 'd', WHITE, "white draconian",
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD | M_SPECIAL_ABILITY,
+    MR_RES_COLD,
+    900, 10, MONS_DRACONIAN, MONS_WHITE_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 10, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_MOTTLED_DRACONIAN, 'd', LIGHTMAGENTA, "mottled draconian", 
+    M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_RES_FIRE,
+    900, 10, MONS_DRACONIAN, MONS_MOTTLED_DRACONIAN, MH_NATURAL, -2,
+    { 20, 0, 0, 0 },
+    { 14, 5, 4, 0 },
+    9, 10, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH,
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_DRACONIAN_CALLER, 'd', BROWN, "draconian caller",  
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3,
+    { 20, 0, 0, 0 },
+    { 16, 4, 3, 0 },
+    9, 10, 10, 10, MST_DRAC_CALLER, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_DRACONIAN_MONK, 'd', BLUE, "draconian monk", 
+    M_FIGHTER | M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3,
+    { 35, 20, 15, 0 },
+    { 16, 6, 3, 0 },
+    6, 20, 10, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{ 
+    MONS_DRACONIAN_ZEALOT, 'd', LIGHTBLUE, "draconian zealot", 
+    M_SPELLCASTER | M_HUMANOID | M_PRIEST | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -3,
+    { 15, 0, 0, 0 },
+    { 16, 4, 2, 0 },
+    12, 10, 10, 10, MST_DEEP_ELF_HIGH_PRIEST, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_DRACONIAN_SHIFTER, 'd', LIGHTCYAN, "draconian shifter", 
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
+    { 15, 0, 0, 0 },
+    { 16, 4, 4, 0 },
+    8, 16, 10, 10, MST_DRAC_SHIFTER, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_DRACONIAN_ANNIHILATOR, 'd', GREEN, "draconian annihilator", 
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
+    { 15, 0, 0, 0 },
+    { 16, 4, 2, 0 },
+    8, 10, 10, 10, MST_DEEP_ELF_ANNIHILATOR, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_DRACONIAN_KNIGHT, 'd', CYAN, "draconian knight", 
+    M_SPELLCASTER | M_HUMANOID | M_FIGHTER | M_FLIES | M_COLD_BLOOD,
+    MR_NO_FLAGS,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
+    { 15, 0, 0, 0 },
+    { 16, 6, 4, 0 },
+    12, 12, 10, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
+{
+    MONS_DRACONIAN_SCORCHER, 'd', LIGHTRED, "draconian scorcher", 
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_HUMANOID | M_FLIES | M_COLD_BLOOD,
+    MR_RES_FIRE | MR_RES_HELLFIRE,
+    900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4,
+    { 15, 0, 0, 0 },
+    { 16, 4, 2, 0 },
+    8, 12, 10, 10, MST_DRAC_SCORCHER, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
+    MONUSE_STARTING_EQUIPMENT
+}
+,
+
 {
     MONS_KILLER_KLOWN, '@', BLACK, "Killer Klown",
-    M_RES_FIRE | M_RES_COLD | M_RES_POISON | M_SEE_INVIS | M_SPEAKS | M_WARM_BLOOD,
-    0, 15, MONS_KILLER_KLOWN, MH_NATURAL, 5000,
+    M_SEE_INVIS | M_SPEAKS | M_WARM_BLOOD | M_SPECIAL_ABILITY,
+    MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON,
+    0, 15, MONS_HUMAN, MONS_KILLER_KLOWN, MH_NATURAL, MAG_IMMUNE,
     { 30, 0, 0, 0 },
     { 20, 5, 5, 0 },
     10, 15, 15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, 
@@ -3318,8 +3828,9 @@
 
 {
     MONS_ELECTRIC_GOLEM, '8', LIGHTCYAN, "electric golem",
-    M_SPELLCASTER | M_RES_ELEC | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_SEE_INVIS,
-    0, 10, MONS_ELECTRIC_GOLEM, MH_NONLIVING, 5000,
+    M_SPELLCASTER | M_SEE_INVIS,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
+    0, 10, MONS_CLAY_GOLEM, MONS_ELECTRIC_GOLEM, MH_NONLIVING, MAG_IMMUNE,
     { 12, 12, 12, 12 },
     { 15, 7, 4, 0 },
     5, 20, 20, 7, MST_ELECTRIC_GOLEM, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3329,8 +3840,9 @@
 
 {
     MONS_BALL_LIGHTNING, '*', LIGHTCYAN, "ball lightning",
-    M_FLIES | M_RES_ELEC | M_CONFUSED | M_SPELLCASTER,
-    0, 20, MONS_BALL_LIGHTNING, MH_NONLIVING, 5000,
+    M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY,
+    MR_RES_ELEC,
+    0, 20, MONS_BALL_LIGHTNING, MONS_BALL_LIGHTNING, MH_NONLIVING, MAG_IMMUNE,
     { 5, 0, 0, 0 },
     { 12, 0, 0, 1 },
     0, 10, 20, 7, MST_STORM_DRAGON, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_PLANT, 
@@ -3340,8 +3852,9 @@
 
 {
     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,
-    0, 10, MONS_ORB_OF_FIRE, MH_NONLIVING, 5000,
+    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, MONS_ORB_OF_FIRE, MH_NONLIVING, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 30, 0, 0, 150 },
     20, 20, 20, 7, MST_ORB_OF_FIRE, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, 
@@ -3352,7 +3865,8 @@
 {
     MONS_QUOKKA, 'r', LIGHTGREY, "quokka",
     M_WARM_BLOOD,
-    300, 10, MONS_QUOKKA, MH_NATURAL, -1,
+    MR_NO_FLAGS,
+    300, 10, MONS_QUOKKA, MONS_QUOKKA, MH_NATURAL, -1,
     { 5, 0, 0, 0 },
     { 1, 3, 5, 0 },
     2, 13, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_NORMAL, 
@@ -3363,7 +3877,8 @@
 {
     MONS_EYE_OF_DEVASTATION, 'G', YELLOW, "eye of devastation",
     M_NO_SKELETON | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS,
-    0, 11, MONS_EYE_OF_DEVASTATION, MH_NATURAL, 5000,
+    MR_RES_ASPHYX,
+    0, 11, MONS_GIANT_EYEBALL, MONS_EYE_OF_DEVASTATION, MH_NATURAL, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 10, 3, 5, 0 },
     12, 1, 7, 7, MST_EYE_OF_DEVASTATION, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3374,7 +3889,8 @@
 {
     MONS_MOTH_OF_WRATH, 'y', BROWN, "moth of wrath",
     M_FLIES,
-    0, 10, MONS_MOTH_OF_WRATH, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 10, MONS_MOTH_OF_WRATH, MONS_MOTH_OF_WRATH, MH_NATURAL, -3,
     { 25, 0, 0, 0 },
     { 9, 3, 5, 0 },
     0, 10, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -3384,8 +3900,9 @@
 
 {
     MONS_DEATH_COB, '%', YELLOW, "death cob",
-    M_RES_POISON | M_RES_COLD | M_SPEAKS,
-    0, 10, MONS_DEATH_COB, MH_UNDEAD, -3,
+    M_SPEAKS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_DEATH_COB, MONS_DEATH_COB, MH_UNDEAD, -3,
     { 20, 0, 0, 0 },
     { 10, 4, 5, 0 },
     10, 15, 25, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_MOAN, I_NORMAL, 
@@ -3394,12 +3911,13 @@
 ,
 
 {
-    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,
-    0, 60, MONS_CURSE_TOE, MH_UNDEAD, 5000,
+    MONS_CURSE_TOE, 'z', YELLOW, "curse toe", 
+    M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_EVIL,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD,
+    0, 60, MONS_LICH, MONS_CURSE_TOE, MH_UNDEAD, MAG_IMMUNE,
     { 0, 0, 0, 0 },
     { 14, 0, 0, 77 },
-    50, 1, 12, 7, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
+    50, 1, 12, 7, MST_CURSE_TOE, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, 
     MONUSE_NOTHING
 }
 ,
@@ -3407,8 +3925,9 @@
 {
     // 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,
-    0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
+    M_NO_SKELETON,
+    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
+    0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { 12, 12, 12, 0 },
     { 8, 3, 5, 0 },
     5, 1, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3418,8 +3937,9 @@
 
 {
     MONS_WEAPON_MIMIC, ')', BLACK, "mimic",
-    M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD,
-    0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
+    M_NO_SKELETON,
+    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
+    0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { 17, 17, 17, 0 },
     { 8, 3, 5, 0 },
     5, 1, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3429,8 +3949,9 @@
 
 {
     MONS_ARMOUR_MIMIC, '[', BLACK, "mimic",
-    M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD,
-    0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
+    M_NO_SKELETON,
+    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
+    0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { 12, 12, 12, 0 },
     { 8, 3, 5, 0 },
     15, 1, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3440,8 +3961,9 @@
 
 {
     MONS_SCROLL_MIMIC, '?', LIGHTGREY, "mimic",
-    M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD,
-    0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
+    M_NO_SKELETON,
+    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
+    0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { 12, 12, 12, 0 },
     { 8, 3, 5, 0 },
     5, 1, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3451,8 +3973,9 @@
 
 {
     MONS_POTION_MIMIC, '!', BLACK, "mimic",
-    M_NO_SKELETON | M_RES_POISON | M_RES_ELEC | M_RES_FIRE | M_RES_COLD,
-    0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
+    M_NO_SKELETON,
+    MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD,
+    0, 13, MONS_GOLD_MIMIC, MONS_GOLD_MIMIC, MH_NONLIVING, -3,
     { 12, 12, 12, 0 },
     { 8, 3, 5, 0 },
     5, 1, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_NORMAL, 
@@ -3462,8 +3985,9 @@
 
 {
     MONS_HELL_HOG, 'h', RED, "hell-hog",
-    M_SPELLCASTER,
-    0, 10, MONS_HELL_HOG, MH_DEMONIC, -3,
+    M_SPELLCASTER | M_THICK_SKIN | M_EVIL,
+    MR_NO_FLAGS,
+    0, 10, MONS_HELL_HOG, MONS_HELL_HOG, MH_DEMONIC, -3,
     { 20, 0, 0, 0 },
     { 11, 3, 5, 0 },
     2, 9, 14, 7, MST_HELL_HOG, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_ANIMAL, 
@@ -3473,8 +3997,9 @@
 
 {
     MONS_SERPENT_OF_HELL, 'D', RED, "Serpent of Hell",
-    M_SPELLCASTER | M_RES_POISON | M_RES_HELLFIRE | M_FLIES | M_SEE_INVIS,
-    0, 18, MONS_SERPENT_OF_HELL, MH_DEMONIC, -13,
+    M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL,
+    MR_RES_POISON | MR_RES_HELLFIRE,
+    0, 18, MONS_SERPENT_OF_HELL, MONS_SERPENT_OF_HELL, MH_DEMONIC, -13,
     { 35, 15, 15, 0 },
     { 20, 4, 4, 0 },
     12, 9, 14, 7, MST_SERPENT_OF_HELL, CE_CLEAN, Z_NOZOMBIE, S_ROAR, I_HIGH, 
@@ -3485,7 +4010,8 @@
 {
     MONS_BOGGART, 'g', DARKGREY, "boggart",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS,
-    0, 14, MONS_BOGGART, MH_NATURAL, -7,
+    MR_NO_FLAGS,
+    0, 14, MONS_BOGGART, MONS_BOGGART, MH_NATURAL, -7,
     { 5, 0, 0, 0 },
     { 2, 3, 5, 0 },
     0, 12, 12, 7, MST_BOGGART, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL, 
@@ -3496,7 +4022,8 @@
 {
     MONS_QUICKSILVER_DRAGON, 'D', LIGHTCYAN, "quicksilver dragon",
     M_SPELLCASTER | M_FLIES | M_SEE_INVIS,
-    0, 14, MONS_QUICKSILVER_DRAGON, MH_NATURAL, -7,
+    MR_NO_FLAGS,
+    0, 14, MONS_DRAGON, MONS_QUICKSILVER_DRAGON, MH_NATURAL, -7,
     { 45, 0, 0, 0 },
     { 16, 3, 5, 0 },
     10, 15, 15, 7, MST_QUICKSILVER_DRAGON, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
@@ -3506,8 +4033,9 @@
 
 {
     MONS_IRON_DRAGON, 'D', CYAN, "iron dragon",
-    M_SPELLCASTER | M_RES_POISON | M_RES_FIRE | M_RES_COLD | M_SEE_INVIS,
-    0, 14, MONS_IRON_DRAGON, MH_NATURAL, -7,
+    M_SPELLCASTER | M_SEE_INVIS,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
+    0, 14, MONS_DRAGON, MONS_IRON_DRAGON, MH_NATURAL, -7,
     { 25, 25, 25, 0 },
     { 18, 5, 3, 0 },
     20, 6, 8, 7, MST_IRON_DRAGON, CE_CONTAMINATED, Z_SMALL, S_ROAR, I_HIGH, 
@@ -3517,8 +4045,9 @@
 
 {
     MONS_SKELETAL_WARRIOR, 'z', CYAN, "skeletal warrior",
-    M_SPELLCASTER | M_RES_POISON | M_RES_COLD | M_ACTUAL_SPELLS,
-    0, 10, MONS_SKELETAL_WARRIOR, MH_UNDEAD, -7,
+    M_SPELLCASTER | M_ACTUAL_SPELLS | M_EVIL,
+    MR_RES_POISON | MR_RES_COLD,
+    0, 10, MONS_SKELETAL_WARRIOR, MONS_SKELETAL_WARRIOR, MH_UNDEAD, -7,
     { 25, 0, 0, 0 },
     { 10, 5, 3, 0 },
     15, 10, 10, 7, MST_SKELETAL_WARRIOR, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_NORMAL, 
@@ -3530,8 +4059,9 @@
 /* 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,
-    0, 15, MONS_PLAYER_GHOST, MH_UNDEAD, -5,
+    M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES | M_UNIQUE,
+    MR_RES_POISON,
+    0, 15, MONS_PHANTOM, MONS_PLAYER_GHOST, MH_UNDEAD, -5,
     { 5, 0, 0, 0 },
     { 4, 2, 3, 0 },
     1, 2, 10, 7, MST_GHOST, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_HIGH, 
@@ -3542,8 +4072,9 @@
 /* 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,
-    0, 14, MONS_PANDEMONIUM_DEMON, MH_DEMONIC, -5,
+    M_SPELLCASTER | M_SPEAKS | M_EVIL | M_UNIQUE,
+    MR_RES_POISON,
+    0, 14, MONS_PANDEMONIUM_DEMON, MONS_PANDEMONIUM_DEMON, MH_DEMONIC, -5,
     { 5, 0, 0, 0 },
     { 4, 2, 3, 0 },
     1, 2, 10, 7, MST_GHOST, CE_CONTAMINATED, Z_NOZOMBIE, S_RANDOM, I_HIGH, 
@@ -3554,8 +4085,9 @@
 // begin lava monsters {dlb}
 {
     MONS_LAVA_WORM, 'w', RED, "lava worm",
-    M_RES_FIRE | M_ED_COLD,
-    0, 10, MONS_LAVA_WORM, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_RES_FIRE | MR_VUL_COLD,
+    0, 10, MONS_LAVA_WORM, MONS_LAVA_WORM, MH_NATURAL, -3,
     { 15, 0, 0, 0 },
     { 6, 3, 5, 0 },
     1, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL_LIKE, 
@@ -3565,8 +4097,9 @@
 
 {
     MONS_LAVA_FISH, ';', RED, "lava fish",
-    M_RES_FIRE | M_ED_COLD,
-    0, 10, MONS_LAVA_FISH, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_RES_FIRE | MR_VUL_COLD,
+    0, 10, MONS_BIG_FISH, MONS_LAVA_FISH, MH_NATURAL, -3,
     { 10, 0, 0, 0 },
     { 4, 3, 5, 0 },
     4, 15, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL_LIKE, 
@@ -3576,8 +4109,9 @@
 
 {
     MONS_LAVA_SNAKE, 'S', RED, "lava snake",
-    M_RES_FIRE | M_ED_COLD,
-    0, 10, MONS_LAVA_SNAKE, MH_NATURAL, -3,
+    M_SPECIAL_ABILITY,
+    MR_RES_FIRE | MR_VUL_COLD,
+    0, 10, MONS_SNAKE, MONS_LAVA_SNAKE, MH_NATURAL, -3,
     { 7, 0, 0, 0 },
     { 3, 3, 5, 0 },
     2, 17, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_HISS, I_ANIMAL_LIKE, 
@@ -3587,8 +4121,9 @@
 
 {  // mv: was another lava thing
     MONS_SALAMANDER, 'S', LIGHTRED, "salamander",
-    M_RES_FIRE | M_ED_COLD | M_WARM_BLOOD,
-    0, 10, MONS_SALAMANDER, MH_NATURAL, -3,
+    M_WARM_BLOOD,
+    MR_RES_FIRE | MR_VUL_COLD,
+    0, 10, MONS_SALAMANDER, MONS_SALAMANDER, MH_NATURAL, -3,
     { 23, 0, 0, 0 },
     { 14, 3, 5, 0 },
     5, 5, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_HIGH, 
@@ -3602,7 +4137,8 @@
 {
     MONS_BIG_FISH, ';', LIGHTGREEN, "big fish",
     M_COLD_BLOOD,
-    0, 10, MONS_BIG_FISH, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 10, MONS_BIG_FISH, MONS_BIG_FISH, MH_NATURAL, -3,
     { 8, 0, 0, 0 },
     { 4, 3, 5, 0 },
     1, 12, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL_LIKE, 
@@ -3613,7 +4149,8 @@
 {
     MONS_GIANT_GOLDFISH, ';', LIGHTRED, "giant goldfish",
     M_COLD_BLOOD,
-    0, 10, MONS_GIANT_GOLDFISH, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 10, MONS_BIG_FISH, MONS_GIANT_GOLDFISH, MH_NATURAL, -3,
     { 15, 0, 0, 0 },
     { 7, 3, 5, 0 },
     5, 7, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL_LIKE, 
@@ -3623,8 +4160,9 @@
 
 {
     MONS_ELECTRICAL_EEL, ';', LIGHTBLUE, "electrical eel",
-    M_RES_ELEC | M_COLD_BLOOD,
-    0, 10, MONS_ELECTRICAL_EEL, MH_NATURAL, -3,
+    M_COLD_BLOOD | M_SPECIAL_ABILITY,
+    MR_RES_ELEC,
+    0, 10, MONS_ELECTRICAL_EEL, MONS_ELECTRICAL_EEL, MH_NATURAL, -3,
     { 0, 0, 0, 0 },
     { 3, 3, 5, 0 },
     1, 15, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_ANIMAL_LIKE, 
@@ -3634,8 +4172,9 @@
 
 {
     MONS_JELLYFISH, 'J', CYAN, "jellyfish",
-    M_RES_POISON,
-    0, 10, MONS_JELLYFISH, MH_NATURAL, -3,
+    M_NO_FLAGS,
+    MR_RES_POISON,
+    0, 10, MONS_JELLYFISH, MONS_JELLYFISH, MH_NATURAL, -3,
     { 1, 1, 0, 0 },
     { 4, 3, 5, 0 },
     0, 5, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_PLANT, 
@@ -3645,8 +4184,9 @@
 
 {
     MONS_WATER_ELEMENTAL, '{', LIGHTBLUE, "water elemental",
-    M_RES_POISON | M_ED_FIRE | M_FLIES | M_RES_ELEC,
-    0, 10, MONS_WATER_ELEMENTAL, MH_NONLIVING, 5000,
+    M_FLIES,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_ELEC,
+    0, 10, MONS_EARTH_ELEMENTAL, MONS_WATER_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
     { 25, 0, 0, 0 },
     { 6, 5, 3, 0 },
     0, 7, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3657,7 +4197,8 @@
 {
     MONS_SWAMP_WORM, 'w', BROWN, "swamp worm",
     M_AMPHIBIOUS,
-    0, 10, MONS_SWAMP_WORM, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    0, 10, MONS_WORM, MONS_SWAMP_WORM, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 5, 5, 5, 0 },
     3, 12, 12, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT, I_PLANT, 
@@ -3679,8 +4220,9 @@ 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,
-    1000, 10, MONS_SHUGGOTH, MH_DEMONIC, 300,
+    M_NO_SKELETON | M_SEE_INVIS,
+    MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD,
+    1000, 10, MONS_SHUGGOTH, MONS_SHUGGOTH, MH_DEMONIC, 300,
     { 5, 5, 5, 0 },
     { 10, 4, 4, 0 },
     10, 10, 20, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, -1, I_NORMAL, 
@@ -3692,7 +4234,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_WOLF, 'h', LIGHTGREY, "wolf",
     M_WARM_BLOOD | M_SEE_INVIS, //jmf: until smell exists
-    450, 10, MONS_WOLF, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    450, 10, MONS_HOUND, MONS_WOLF, MH_NATURAL, -3,
     { 8, 2, 2, 0 },
     { 4, 3, 5, 0 },
     3, 15, 17, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BARK, I_ANIMAL, 
@@ -3702,8 +4245,9 @@ not think it fits into Crawl ... {dlb}
 
 {
     MONS_WARG, 'h', DARKGREY, "warg",
-    M_SEE_INVIS | M_RES_POISON | M_WARM_BLOOD,
-    600, 12, MONS_WARG, MH_NATURAL, -6,
+    M_SEE_INVIS | M_WARM_BLOOD,
+    MR_RES_POISON,
+    600, 12, MONS_HOUND, MONS_WARG, MH_NATURAL, -6,
     { 12, 3, 3, 0 },
     { 4, 4, 5, 0 },
     4, 12, 13, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, I_ANIMAL, 
@@ -3714,7 +4258,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_BEAR, 'U', BROWN, "bear",
     M_WARM_BLOOD,
-    2000, 10, MONS_BEAR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    2000, 10, MONS_BEAR, MONS_BEAR, MH_NATURAL, -3,
     { 10, 6, 6, 0 },
     { 7, 3, 3, 0 },
     4, 4, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, 
@@ -3725,7 +4270,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_GRIZZLY_BEAR, 'U', LIGHTGREY, "grizzly bear",
     M_WARM_BLOOD,
-    2500, 10, MONS_GRIZZLY_BEAR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    2500, 10, MONS_BEAR, MONS_GRIZZLY_BEAR, MH_NATURAL, -3,
     { 12, 8, 8, 0 },
     { 7, 4, 4, 0 },
     5, 8, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, 
@@ -3735,8 +4281,9 @@ not think it fits into Crawl ... {dlb}
 
 {
     MONS_POLAR_BEAR, 'U', WHITE, "polar bear",
-    M_RES_COLD | M_WARM_BLOOD | M_AMPHIBIOUS,
-    2500, 10, MONS_POLAR_BEAR, MH_NATURAL, -3,
+    M_WARM_BLOOD | M_AMPHIBIOUS,
+    MR_RES_COLD,
+    2500, 10, MONS_BEAR, MONS_POLAR_BEAR, MH_NATURAL, -3,
     { 20, 5, 5, 0 },    //jmf: polar bears have very strong jaws & necks
     { 7, 5, 3, 0 },
     7, 8, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, 
@@ -3747,7 +4294,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_BLACK_BEAR, 'U', DARKGREY, "black bear",
     M_WARM_BLOOD,
-    1800, 10, MONS_BLACK_BEAR, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    1800, 10, MONS_BEAR, MONS_BLACK_BEAR, MH_NATURAL, -3,
     { 4, 4, 4, 0 },
     { 6, 3, 3, 0 },
     2, 8, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_GROWL, I_ANIMAL, 
@@ -3758,8 +4306,9 @@ not think it fits into Crawl ... {dlb}
 // small simulacrum
 {
     MONS_SIMULACRUM_SMALL, 'z', WHITE, "",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD,
-    0, 6, MONS_SIMULACRUM_SMALL, MH_UNDEAD, -1,
+    M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 6, MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_SMALL, MH_UNDEAD, -1,
     { 6, 0, 0, 0 },
     { 2, 3, 5, 0 },
     10, 4, 7, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3770,8 +4319,9 @@ not think it fits into Crawl ... {dlb}
 // large simulacrum
 {
     MONS_SIMULACRUM_LARGE, 'Z', WHITE, "",
-    M_RES_POISON | M_ED_FIRE | M_RES_COLD,
-    0, 6, MONS_SIMULACRUM_LARGE, MH_UNDEAD, -1,
+    M_EVIL,
+    MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
+    0, 6, MONS_SIMULACRUM_SMALL, MONS_SIMULACRUM_LARGE, MH_UNDEAD, -1,
     { 14, 0, 0, 0 },
     { 5, 3, 5, 0 },
     10, 5, 7, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, 
@@ -3782,7 +4332,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_GIANT_NEWT, 'l', LIGHTGREEN, "giant newt",
     M_COLD_BLOOD | M_AMPHIBIOUS,
-    150, 10, MONS_GIANT_NEWT, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    150, 10, MONS_GIANT_LIZARD, MONS_GIANT_NEWT, MH_NATURAL, -3,
     { 3, 0, 0, 0 },
     { 1, 1, 2, 0 },
     0, 15, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_REPTILE, 
@@ -3793,7 +4344,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_GIANT_GECKO, 'l', YELLOW, "giant gecko",
     M_COLD_BLOOD,
-    250, 10, MONS_GIANT_GECKO, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    250, 10, MONS_GIANT_LIZARD, MONS_GIANT_GECKO, MH_NATURAL, -3,
     { 5, 0, 0, 0 },
     { 1, 3, 5, 0 },
     1, 14, 12, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_REPTILE, 
@@ -3804,7 +4356,8 @@ not think it fits into Crawl ... {dlb}
 {
     MONS_GIANT_IGUANA, 'l', BLUE, "giant iguana",
     M_COLD_BLOOD,
-    400, 10, MONS_GIANT_IGUANA, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    400, 10, MONS_GIANT_LIZARD, MONS_GIANT_IGUANA, MH_NATURAL, -3,
     { 15, 0, 0, 0 },
     { 3, 3, 5, 0 },
     5, 9, 10, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, I_REPTILE, 
@@ -3816,7 +4369,8 @@ 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,
-    500, 10, MONS_GILA_MONSTER, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    500, 10, MONS_GIANT_LIZARD, MONS_GILA_MONSTER, MH_NATURAL, -3,
     { 20, 0, 0, 0 },
     { 5, 4, 4, 0 },
     3, 12, 10, 7, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_HISS, I_REPTILE, 
@@ -3825,9 +4379,10 @@ not think it fits into Crawl ... {dlb}
 ,
 
 {
-    MONS_KOMODO_DRAGON, 'l', BROWN, "komodo dragon",
+    MONS_KOMODO_DRAGON, 'l', LIGHTRED, "komodo dragon",
     M_COLD_BLOOD | M_AMPHIBIOUS,
-    800, 10, MONS_KOMODO_DRAGON, MH_NATURAL, -3,
+    MR_NO_FLAGS,
+    800, 10, MONS_GIANT_LIZARD, MONS_KOMODO_DRAGON, MH_NATURAL, -3,
     { 30, 0, 0, 0 },
     { 8, 3, 5, 0 },
     7, 8, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_HISS, I_REPTILE, 
@@ -3835,4 +4390,28 @@ not think it fits into Crawl ... {dlb}
 }
 ,
 
+{
+    MONS_ORANGE_STATUE, '8', LIGHTRED, "orange crystal statue",
+    M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_ORANGE_STATUE, MH_NONLIVING, MAG_IMMUNE,
+    { 0, 0, 0, 0 },
+    { 3, 50, 30, 120 },
+    30, 3, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
+    MONUSE_NOTHING
+}
+,
+
+{
+    MONS_SILVER_STATUE, '8', WHITE, "silver statue",
+    M_SPECIAL_ABILITY,
+    MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
+    0, 10, MONS_CLAY_GOLEM, MONS_SILVER_STATUE, MH_NONLIVING, MAG_IMMUNE,
+    { 0, 0, 0, 0 },
+    { 3, 50, 0, 120 },
+    30, 3, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, 
+    MONUSE_NOTHING
+}
+,
+
 #endif