diff options
Diffstat (limited to 'crawl-ref/source/mon-data.h')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 928 |
1 files changed, 567 insertions, 361 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 748296cb60..f51df5b096 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -107,7 +107,7 @@ MONS_PROGRAM_BUG, 'B', LIGHTRED, "program bug", M_NO_EXP_GAIN, MR_NO_FLAGS, - 0, 10, MONS_PROGRAM_BUG, MH_NATURAL, -3, + 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, @@ -120,7 +120,7 @@ MONS_GIANT_ANT, 'a', DARKGREY, "giant ant", M_NO_FLAGS, MR_VUL_POISON, - 700, 10, MONS_GIANT_ANT, MH_NATURAL, -3, + 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, @@ -132,7 +132,7 @@ MONS_GIANT_BAT, 'b', DARKGREY, "giant bat", M_FLIES | M_SEE_INVIS | M_WARM_BLOOD, MR_NO_FLAGS, - 150, 4, MONS_GIANT_BAT, MH_NATURAL, -1, + 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, @@ -144,7 +144,7 @@ MONS_CENTAUR, 'c', BROWN, "centaur", M_WARM_BLOOD, MR_NO_FLAGS, - 1500, 10, MONS_CENTAUR, MH_NATURAL, -3, + 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, @@ -156,7 +156,7 @@ MONS_RED_DEVIL, '4', RED, "red devil", M_FLIES | M_EVIL, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, - 0, 10, MONS_RED_DEVIL, MH_DEMONIC, -7, + 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, @@ -168,7 +168,7 @@ MONS_ETTIN, 'C', BROWN, "ettin", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_ETTIN, MH_NATURAL, -3, + 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, @@ -180,7 +180,7 @@ MONS_FUNGUS, 'f', LIGHTGREY, "fungus", M_NO_EXP_GAIN, MR_RES_POISON, - 0, 10, MONS_FUNGUS, MH_PLANT, 5000, + 0, 10, MONS_PLANT, MONS_FUNGUS, MH_PLANT, 5000, { 0, 0, 0, 0 }, { 8, 3, 5, 0 }, 1, 0, 0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -192,7 +192,7 @@ MONS_GOBLIN, 'g', LIGHTGREY, "goblin", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 400, 10, MONS_GOBLIN, MH_NATURAL, -1, + 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, @@ -204,7 +204,7 @@ MONS_HOUND, 'h', BROWN, "hound", M_SEE_INVIS | M_WARM_BLOOD, MR_NO_FLAGS, - 300, 10, MONS_HOUND, MH_NATURAL, -3, + 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, @@ -215,9 +215,9 @@ // note: these things regenerate { MONS_IMP, '5', RED, "imp", - M_FLIES | M_SEE_INVIS | M_SPEAKS | M_EVIL, + 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, MH_DEMONIC, -9, + 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, @@ -229,7 +229,7 @@ MONS_JACKAL, 'j', YELLOW, "jackal", M_WARM_BLOOD, MR_NO_FLAGS, - 200, 10, MONS_JACKAL, MH_NATURAL, -1, + 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, @@ -241,7 +241,7 @@ MONS_KILLER_BEE, 'k', YELLOW, "killer bee", M_FLIES, MR_VUL_POISON, - 150, 11, MONS_KILLER_BEE, MH_NATURAL, -3, + 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, @@ -253,7 +253,7 @@ MONS_KILLER_BEE_LARVA, 'w', LIGHTGREY, "killer bee larva", M_NO_SKELETON, MR_VUL_POISON, - 150, 5, MONS_KILLER_BEE_LARVA, MH_NATURAL, -3, + 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, @@ -263,9 +263,9 @@ { MONS_MANTICORE, 'm', BROWN, "manticore", - M_WARM_BLOOD, + M_WARM_BLOOD | M_SPECIAL_ABILITY, MR_NO_FLAGS, - 1800, 10, MONS_MANTICORE, MH_NATURAL, -3, + 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, @@ -278,7 +278,7 @@ MONS_NECROPHAGE, 'n', DARKGREY, "necrophage", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 500, 10, MONS_NECROPHAGE, MH_UNDEAD, -5, + 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, @@ -290,7 +290,7 @@ MONS_ORC, 'o', LIGHTRED, "orc", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 600, 10, MONS_ORC, MH_NATURAL, -3, + 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, @@ -302,9 +302,9 @@ // dangerous, but still come out at 200+ XP { MONS_PHANTOM, 'p', BLUE, "phantom", - M_EVIL, + M_EVIL | M_SPECIAL_ABILITY, MR_RES_POISON | MR_RES_COLD, - 0, 5, MONS_PHANTOM, MH_UNDEAD, -4, + 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, @@ -316,7 +316,7 @@ MONS_QUASIT, 'q', LIGHTGREY, "quasit", M_EVIL, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 0, 10, MONS_QUASIT, MH_DEMONIC, 50, + 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, @@ -328,7 +328,7 @@ MONS_RAT, 'r', BROWN, "rat", M_WARM_BLOOD, MR_NO_FLAGS, - 200, 10, MONS_RAT, MH_NATURAL, -1, + 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, @@ -340,7 +340,7 @@ MONS_SCORPION, 's', DARKGREY, "scorpion", M_NO_FLAGS, MR_VUL_POISON, - 500, 10, MONS_SCORPION, MH_NATURAL, -3, + 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, @@ -368,7 +368,7 @@ MONS_UGLY_THING, 'u', BROWN, "ugly thing", M_WARM_BLOOD | M_AMPHIBIOUS, MR_NO_FLAGS, - 600, 10, MONS_UGLY_THING, MH_NATURAL, -3, + 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, @@ -380,7 +380,7 @@ MONS_FIRE_VORTEX, 'v', RED, "fire vortex", M_LEVITATE | M_CONFUSED, MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD | MR_RES_ELEC, - 0, 5, MONS_FIRE_VORTEX, MH_NONLIVING, 5000, + 0, 5, MONS_FIRE_VORTEX, MONS_FIRE_VORTEX, MH_NONLIVING, 5000, { 30, 0, 0, 0 }, { 3, 3, 5, 0 }, 0, 5, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -392,7 +392,7 @@ MONS_WORM, 'w', LIGHTRED, "worm", M_NO_SKELETON, MR_NO_FLAGS, - 350, 4, MONS_WORM, MH_NATURAL, -2, + 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, @@ -405,7 +405,7 @@ MONS_ABOMINATION_SMALL, 'x', BLACK, "abomination", M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_ABOMINATION_SMALL, MH_DEMONIC, -5, + 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, @@ -417,7 +417,7 @@ MONS_YELLOW_WASP, 'y', YELLOW, "yellow wasp", M_FLIES, MR_VUL_POISON, - 220, 12, MONS_YELLOW_WASP, MH_NATURAL, -3, + 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, @@ -430,7 +430,7 @@ MONS_ZOMBIE_SMALL, 'z', BROWN, "", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 6, MONS_ZOMBIE_SMALL, MH_UNDEAD, -1, + 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, @@ -442,7 +442,7 @@ MONS_ANGEL, 'A', WHITE, "Angel", M_FLIES | M_SPELLCASTER, MR_RES_POISON | MR_RES_ELEC, - 0, 10, MONS_ANGEL, MH_HOLY, -8, + 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, @@ -454,7 +454,7 @@ MONS_GIANT_BEETLE, 'B', DARKGREY, "giant beetle", M_NO_FLAGS, MR_VUL_POISON, - 1000, 10, MONS_GIANT_BEETLE, MH_NATURAL, -3, + 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, @@ -466,7 +466,7 @@ MONS_CYCLOPS, 'C', BROWN, "cyclops", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 2500, 10, MONS_CYCLOPS, MH_NATURAL, -3, + 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, @@ -476,9 +476,9 @@ { MONS_DRAGON, 'D', GREEN, "dragon", - M_FLIES, //jmf: warm blood? + M_FLIES | M_SPECIAL_ABILITY, //jmf: warm blood? MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD, - 2200, 12, MONS_DRAGON, MH_NATURAL, -4, + 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, @@ -492,7 +492,7 @@ MONS_TWO_HEADED_OGRE, 'O', LIGHTRED, "two-headed ogre", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 1500, 15, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4, + 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, @@ -504,7 +504,7 @@ MONS_FIEND, '1', LIGHTRED, "Fiend", //jmf: was RED, like Balrog M_FLIES | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, - 0, 18, MONS_FIEND, MH_DEMONIC, -12, + 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, @@ -516,7 +516,7 @@ MONS_GIANT_SPORE, 'G', GREEN, "giant spore", M_LEVITATE, MR_RES_POISON, - 0, 10, MONS_GIANT_SPORE, MH_NATURAL, -3, + 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, @@ -528,7 +528,7 @@ MONS_HOBGOBLIN, 'g', BROWN, "hobgoblin", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 500, 10, MONS_HOBGOBLIN, MH_NATURAL, -1, + 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, @@ -540,7 +540,7 @@ MONS_ICE_BEAST, 'I', WHITE, "ice beast", M_NO_FLAGS, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 12, MONS_ICE_BEAST, MH_NATURAL, -3, + 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, @@ -552,7 +552,7 @@ MONS_JELLY, 'J', LIGHTRED, "jelly", M_SEE_INVIS | M_SPLITS | M_AMPHIBIOUS, MR_RES_POISON, - 0, 13, MONS_JELLY, MH_NATURAL, -3, + 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, @@ -564,7 +564,7 @@ MONS_KOBOLD, 'K', BROWN, "kobold", M_WARM_BLOOD, MR_NO_FLAGS, - 400, 10, MONS_KOBOLD, MH_NATURAL, -1, + 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, @@ -576,7 +576,7 @@ MONS_LICH, 'L', WHITE, "lich", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, - 0, 16, MONS_LICH, MH_UNDEAD, -11, + 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, @@ -588,7 +588,7 @@ MONS_MUMMY, 'M', WHITE, "mummy", M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 10, MONS_MUMMY, MH_UNDEAD, -5, + 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, @@ -600,7 +600,7 @@ MONS_GUARDIAN_NAGA, 'N', LIGHTGREEN, "guardian naga", M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_RES_POISON, - 350, 10, MONS_GUARDIAN_NAGA, MH_NATURAL, -6, + 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, @@ -612,7 +612,7 @@ MONS_OGRE, 'O', BROWN, "ogre", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 1300, 10, MONS_OGRE, MH_NATURAL, -3, + 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, @@ -624,7 +624,7 @@ MONS_PLANT, 'P', GREEN, "plant", M_NO_EXP_GAIN, MR_NO_FLAGS, - 0, 10, MONS_PLANT, MH_PLANT, 5000, + 0, 10, MONS_PLANT, MONS_PLANT, MH_PLANT, 5000, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, 10, 0, 0, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -636,7 +636,7 @@ MONS_QUEEN_BEE, 'Q', YELLOW, "queen bee", M_FLIES, MR_VUL_POISON, - 200, 14, MONS_QUEEN_BEE, MH_NATURAL, -3, + 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, @@ -648,7 +648,7 @@ MONS_RAKSHASA, 'R', YELLOW, "rakshasa", M_SPELLCASTER | M_SEE_INVIS | M_EVIL, MR_RES_POISON, - 0, 15, MONS_RAKSHASA, MH_NATURAL, -10, + 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, @@ -660,7 +660,7 @@ MONS_SNAKE, 'S', GREEN, "snake", M_COLD_BLOOD | M_AMPHIBIOUS, MR_NO_FLAGS, - 200, 10, MONS_SNAKE, MH_NATURAL, -3, + 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, @@ -672,7 +672,7 @@ MONS_TROLL, 'T', BROWN, "troll", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 1500, 10, MONS_TROLL, MH_NATURAL, -3, + 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, @@ -684,7 +684,7 @@ MONS_UNSEEN_HORROR, 'x', MAGENTA, "unseen horror", M_LEVITATE | M_SEE_INVIS | M_INVIS, MR_RES_ELEC, - 0, 12, MONS_UNSEEN_HORROR, MH_NATURAL, -3, + 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, @@ -696,7 +696,7 @@ MONS_VAMPIRE, 'V', RED, "vampire", M_SPELLCASTER | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 11, MONS_VAMPIRE, MH_UNDEAD, -6, + 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, @@ -708,7 +708,7 @@ MONS_WRAITH, 'W', DARKGREY, "wraith", M_LEVITATE | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 11, MONS_WRAITH, MH_UNDEAD, -7, + 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, @@ -721,7 +721,7 @@ MONS_ABOMINATION_LARGE, 'X', BLACK, "abomination", M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_ABOMINATION_LARGE, MH_DEMONIC, -7, + 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, @@ -733,7 +733,7 @@ MONS_YAK, 'Y', BROWN, "yak", M_WARM_BLOOD, MR_NO_FLAGS, - 1200, 10, MONS_YAK, MH_NATURAL, -3, + 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, @@ -746,7 +746,7 @@ MONS_ZOMBIE_LARGE, 'Z', BROWN, "", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 6, MONS_ZOMBIE_LARGE, MH_UNDEAD, -1, + 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, @@ -758,7 +758,7 @@ MONS_ORC_WARRIOR, 'o', YELLOW, "orc warrior", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_ORC, MH_NATURAL, -3, + 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, @@ -770,7 +770,7 @@ MONS_KOBOLD_DEMONOLOGIST, 'K', MAGENTA, "kobold demonologist", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_KOBOLD, MH_NATURAL, -5, + 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, @@ -782,7 +782,7 @@ MONS_ORC_WIZARD, 'o', MAGENTA, "orc wizard", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_ORC, MH_NATURAL, -5, + 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, @@ -794,7 +794,7 @@ MONS_ORC_KNIGHT, 'o', LIGHTCYAN, "orc knight", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_ORC, MH_NATURAL, -3, + 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, @@ -822,7 +822,7 @@ MONS_WYVERN, 'D', LIGHTRED, "wyvern", M_NO_FLAGS, //jmf: warm blood? MR_NO_FLAGS, - 2000, 10, MONS_WYVERN, MH_NATURAL, -3, + 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, @@ -834,7 +834,7 @@ MONS_BIG_KOBOLD, 'K', RED, "big kobold", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_BIG_KOBOLD, MH_NATURAL, -3, + 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, @@ -846,7 +846,7 @@ MONS_GIANT_EYEBALL, 'G', WHITE, "giant eyeball", M_NO_SKELETON | M_LEVITATE, MR_NO_FLAGS, - 400, 10, MONS_GIANT_EYEBALL, MH_NATURAL, -3, + 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, @@ -858,7 +858,7 @@ MONS_WIGHT, 'W', LIGHTGREY, "wight", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_WIGHT, MH_UNDEAD, -4, + 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, @@ -868,9 +868,9 @@ { MONS_OKLOB_PLANT, 'P', GREEN, "oklob plant", - M_NO_FLAGS, + M_SPECIAL_ABILITY, MR_RES_POISON, - 0, 10, MONS_OKLOB_PLANT, MH_PLANT, -3, + 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, @@ -882,7 +882,7 @@ MONS_WOLF_SPIDER, 's', BROWN, "wolf spider", M_NO_FLAGS, MR_VUL_POISON, - 800, 10, MONS_WOLF_SPIDER, MH_NATURAL, -3, + 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, @@ -894,7 +894,7 @@ MONS_SHADOW, ' ', BLACK, "shadow", M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_SHADOW, MH_UNDEAD, -5, + 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, @@ -906,7 +906,7 @@ MONS_HUNGRY_GHOST, 'p', GREEN, "hungry ghost", M_SEE_INVIS | M_FLIES | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_HUNGRY_GHOST, MH_UNDEAD, -4, + 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, @@ -918,7 +918,7 @@ MONS_EYE_OF_DRAINING, 'G', LIGHTGREY, "eye of draining", M_NO_SKELETON | M_LEVITATE | M_SEE_INVIS, MR_NO_FLAGS, - 400, 10, MONS_EYE_OF_DRAINING, MH_NATURAL, 5000, + 400, 10, MONS_GIANT_EYEBALL, MONS_EYE_OF_DRAINING, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 7, 3, 5, 0 }, 3, 1, 5, 7, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -930,7 +930,7 @@ MONS_BUTTERFLY, 'b', BLACK, "butterfly", M_FLIES | M_CONFUSED, MR_VUL_POISON, - 150, 10, MONS_BUTTERFLY, MH_NATURAL, -3, + 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, @@ -942,7 +942,7 @@ MONS_WANDERING_MUSHROOM, 'f', BROWN, "wandering mushroom", M_NO_FLAGS, MR_RES_POISON, - 0, 10, MONS_WANDERING_MUSHROOM, MH_PLANT, -3, + 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, @@ -954,7 +954,7 @@ MONS_EFREET, 'E', RED, "efreet", M_SPELLCASTER | M_LEVITATE | M_EVIL, MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD, - 0, 12, MONS_EFREET, MH_DEMONIC, -3, + 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, @@ -966,7 +966,7 @@ MONS_BRAIN_WORM, 'w', LIGHTMAGENTA, "brain worm", M_SPELLCASTER, MR_NO_FLAGS, - 150, 10, MONS_BRAIN_WORM, MH_NATURAL, -3, + 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, @@ -978,7 +978,7 @@ MONS_GIANT_ORANGE_BRAIN, 'G', LIGHTRED, "giant orange brain", M_NO_SKELETON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, MR_NO_FLAGS, - 1000, 13, MONS_GIANT_ORANGE_BRAIN, MH_NATURAL, -8, + 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, @@ -990,7 +990,7 @@ MONS_BOULDER_BEETLE, 'B', LIGHTGREY, "boulder beetle", M_NO_FLAGS, MR_VUL_POISON, - 2500, 10, MONS_BOULDER_BEETLE, MH_NATURAL, -3, + 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, @@ -1002,7 +1002,7 @@ MONS_FLYING_SKULL, 'z', WHITE, "flying skull", M_LEVITATE, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_FLYING_SKULL, MH_UNDEAD, -3, + 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, @@ -1012,9 +1012,9 @@ { MONS_HELL_HOUND, 'h', DARKGREY, "hell hound", - M_SEE_INVIS | M_EVIL, + M_SEE_INVIS | M_EVIL | M_SPECIAL_ABILITY, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, - 0, 10, MONS_HELL_HOUND, MH_DEMONIC, -3, + 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, @@ -1026,7 +1026,7 @@ MONS_MINOTAUR, 'm', LIGHTRED, "minotaur", M_WARM_BLOOD, MR_NO_FLAGS, - 1500, 10, MONS_MINOTAUR, MH_NATURAL, -3, + 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, @@ -1036,9 +1036,9 @@ { MONS_ICE_DRAGON, 'D', WHITE, "ice dragon", - M_FLIES, + M_FLIES | M_SPECIAL_ABILITY, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 2200, 10, MONS_ICE_DRAGON, MH_NATURAL, -3, + 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, @@ -1050,7 +1050,7 @@ MONS_SLIME_CREATURE, 'J', GREEN, "slime creature", M_AMPHIBIOUS, MR_RES_POISON, - 0, 5, MONS_SLIME_CREATURE, MH_NATURAL, -3, + 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, @@ -1062,7 +1062,7 @@ MONS_FREEZING_WRAITH, 'W', LIGHTBLUE, "freezing wraith", M_LEVITATE | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 10, MONS_FREEZING_WRAITH, MH_UNDEAD, -4, + 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, @@ -1075,7 +1075,7 @@ MONS_RAKSHASA_FAKE, 'R', YELLOW, "rakshasa", M_EVIL, MR_RES_POISON, - 0, 10, MONS_RAKSHASA_FAKE, MH_NATURAL, 5000, + 0, 10, MONS_RAKSHASA_FAKE, MONS_RAKSHASA_FAKE, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 1, 0, 0, 1 }, 0, 30, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_ROAR, I_PLANT, @@ -1087,7 +1087,7 @@ MONS_GREAT_ORB_OF_EYES, 'G', LIGHTGREEN, "great orb of eyes", M_NO_SKELETON | M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS, MR_RES_POISON, - 900, 13, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, 5000, + 900, 13, MONS_GIANT_EYEBALL, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, 5000, { 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, @@ -1099,7 +1099,7 @@ MONS_HELLION, '3', BLACK, "hellion", M_SPELLCASTER | M_ON_FIRE | M_EVIL, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, - 0, 11, MONS_HELLION, MH_DEMONIC, -7, + 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, @@ -1111,7 +1111,7 @@ MONS_ROTTING_DEVIL, '4', GREEN, "rotting devil", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_ROTTING_DEVIL, MH_DEMONIC, -7, + 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, @@ -1123,7 +1123,7 @@ MONS_TORMENTOR, '3', YELLOW, "tormentor", M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL, MR_RES_POISON | MR_RES_FIRE, - 0, 10, MONS_TORMENTOR, MH_DEMONIC, -6, + 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, @@ -1135,7 +1135,7 @@ MONS_REAPER, '2', LIGHTGREY, "reaper", M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_REAPER, MH_DEMONIC, 5000, + 0, 10, MONS_REAPER, MONS_REAPER, MH_DEMONIC, 5000, { 32, 0, 0, 0 }, { 8, 3, 5, 0 }, 15, 10, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_HIGH, @@ -1147,7 +1147,7 @@ MONS_SOUL_EATER, '2', DARKGREY, "soul eater", M_LEVITATE | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 12, MONS_SOUL_EATER, MH_DEMONIC, -10, + 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, @@ -1159,7 +1159,7 @@ MONS_HAIRY_DEVIL, '4', LIGHTRED, "hairy devil", M_EVIL, MR_RES_POISON, - 0, 10, MONS_HAIRY_DEVIL, MH_DEMONIC, -4, + 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, @@ -1171,7 +1171,7 @@ MONS_ICE_DEVIL, '2', WHITE, "ice devil", M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 11, MONS_ICE_DEVIL, MH_DEMONIC, -6, + 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, @@ -1183,7 +1183,7 @@ MONS_BLUE_DEVIL, '3', BLUE, "blue devil", M_FLIES | M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 10, MONS_BLUE_DEVIL, MH_DEMONIC, -5, + 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, @@ -1196,7 +1196,7 @@ MONS_BEAST, '4', BROWN, "beast", M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_BEAST, MH_DEMONIC, -3, + 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, @@ -1208,7 +1208,7 @@ MONS_IRON_DEVIL, '3', CYAN, "iron devil", M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, - 0, 10, MONS_IRON_DEVIL, MH_DEMONIC, -6, + 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, @@ -1220,7 +1220,7 @@ MONS_GLOWING_SHAPESHIFTER, '@', RED, "glowing shapeshifter", M_NO_FLAGS, MR_NO_FLAGS, - 600, 10, MONS_SHAPESHIFTER, MH_NATURAL, -6, + 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, @@ -1232,7 +1232,7 @@ MONS_SHAPESHIFTER, '@', LIGHTRED, "shapeshifter", M_NO_FLAGS, MR_NO_FLAGS, - 600, 10, MONS_SHAPESHIFTER, MH_NATURAL, -6, + 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, @@ -1244,7 +1244,7 @@ MONS_GIANT_MITE, 's', LIGHTRED, "giant mite", M_NO_FLAGS, MR_VUL_POISON, - 350, 10, MONS_GIANT_MITE, MH_NATURAL, -1, + 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, @@ -1253,10 +1253,10 @@ , { - MONS_STEAM_DRAGON, 'd', LIGHTGREY, "steam dragon", + MONS_STEAM_DRAGON, 'D', LIGHTGREY, "steam dragon", M_SPELLCASTER | M_FLIES, MR_NO_FLAGS, - 1000, 10, MONS_STEAM_DRAGON, MH_NATURAL, -3, + 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, @@ -1268,7 +1268,7 @@ MONS_VERY_UGLY_THING, 'u', RED, "very ugly thing", M_WARM_BLOOD | M_AMPHIBIOUS, MR_NO_FLAGS, - 750, 10, MONS_VERY_UGLY_THING, MH_NATURAL, -3, + 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, @@ -1280,7 +1280,7 @@ MONS_ORC_SORCERER, 'o', DARKGREY, "orc sorcerer", M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, MR_RES_FIRE, - 600, 12, MONS_ORC, MH_NATURAL, -3, + 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, @@ -1292,7 +1292,7 @@ MONS_HIPPOGRIFF, 'H', BROWN, "hippogriff", M_FLIES | M_WARM_BLOOD, MR_NO_FLAGS, - 1000, 10, MONS_HIPPOGRIFF, MH_NATURAL, -3, + 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, @@ -1304,7 +1304,7 @@ MONS_GRIFFON, 'H', YELLOW, "griffon", M_FLIES | M_WARM_BLOOD, MR_NO_FLAGS, - 1800, 10, MONS_GRIFFON, MH_NATURAL, -3, + 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, @@ -1316,7 +1316,7 @@ MONS_HYDRA, 'D', LIGHTGREEN, "hydra", M_AMPHIBIOUS, // because it likes the swamp -- bwr MR_RES_POISON, - 1800, 11, MONS_HYDRA, MH_NATURAL, -3, + 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, @@ -1329,7 +1329,7 @@ MONS_SKELETON_SMALL, 'z', LIGHTGREY, "", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_SKELETON_SMALL, MH_UNDEAD, -1, + 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, @@ -1342,7 +1342,7 @@ MONS_SKELETON_LARGE, 'Z', LIGHTGREY, "", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_SKELETON_LARGE, MH_UNDEAD, -1, + 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, @@ -1355,7 +1355,7 @@ MONS_HELL_KNIGHT, '@', RED, "hell knight", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, MR_RES_FIRE, - 550, 10, MONS_HUMAN, MH_NATURAL, -3, + 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, @@ -1367,7 +1367,7 @@ MONS_NECROMANCER, '@', DARKGREY, "necromancer", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 550, 10, MONS_HUMAN, MH_NATURAL, -4, + 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, @@ -1379,7 +1379,7 @@ MONS_WIZARD, '@', MAGENTA, "wizard", M_SPELLCASTER | M_SPEAKS | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_RES_ELEC, - 550, 10, MONS_HUMAN, MH_NATURAL, -4, + 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, @@ -1391,7 +1391,7 @@ MONS_ORC_PRIEST, 'o', LIGHTGREEN, "orc priest", M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 600, 10, MONS_ORC, MH_NATURAL, -4, + 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, @@ -1403,7 +1403,7 @@ MONS_ORC_HIGH_PRIEST, 'o', GREEN, "orc high priest", M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_EVIL, MR_RES_HELLFIRE, - 600, 10, MONS_ORC, MH_NATURAL, -4, + 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, @@ -1420,7 +1420,7 @@ MONS_HUMAN, '@', LIGHTGRAY, "human", M_WARM_BLOOD, MR_NO_FLAGS, - 550, 10, MONS_HUMAN, MH_NATURAL, -3, + 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, @@ -1432,7 +1432,7 @@ MONS_GNOLL, 'g', YELLOW, "gnoll", M_WARM_BLOOD, MR_NO_FLAGS, - 750, 10, MONS_GNOLL, MH_NATURAL, -3, + 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, @@ -1444,7 +1444,7 @@ MONS_CLAY_GOLEM, '8', BROWN, "clay golem", M_SEE_INVIS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_CLAY_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_CLAY_GOLEM, MH_NONLIVING, 5000, { 11, 11, 0, 0 }, { 8, 7, 3, 0 }, 7, 5, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1456,7 +1456,7 @@ MONS_WOOD_GOLEM, '8', YELLOW, "wood golem", M_NO_FLAGS, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_WOOD_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_WOOD_GOLEM, MH_NONLIVING, 5000, { 10, 0, 0, 0 }, { 6, 6, 3, 0 }, 5, 6, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1468,7 +1468,7 @@ MONS_STONE_GOLEM, '8', LIGHTGREY, "stone golem", M_NO_FLAGS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_STONE_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_STONE_GOLEM, MH_NONLIVING, 5000, { 28, 0, 0, 0 }, { 12, 7, 4, 0 }, 12, 4, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1480,7 +1480,7 @@ MONS_IRON_GOLEM, '8', CYAN, "iron golem", M_SEE_INVIS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_IRON_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_IRON_GOLEM, MH_NONLIVING, 5000, { 35, 0, 0, 0 }, { 15, 7, 4, 0 }, 15, 3, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1492,7 +1492,7 @@ MONS_CRYSTAL_GOLEM, '8', WHITE, "crystal golem", M_SEE_INVIS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_CRYSTAL_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_CRYSTAL_GOLEM, MH_NONLIVING, 5000, { 40, 0, 0, 0 }, { 13, 7, 4, 0 }, 22, 3, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1504,7 +1504,7 @@ MONS_TOENAIL_GOLEM, '8', LIGHTGREY, "toenail golem", M_NO_FLAGS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_TOENAIL_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_TOENAIL_GOLEM, MH_NONLIVING, 5000, { 13, 0, 0, 0 }, { 9, 5, 3, 0 }, 8, 5, 8, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1513,10 +1513,10 @@ , { - MONS_MOTTLED_DRAGON, 'd', LIGHTMAGENTA, "mottled dragon", + MONS_MOTTLED_DRAGON, 'D', RED, "mottled dragon", M_SPELLCASTER | M_FLIES, MR_RES_POISON | MR_RES_FIRE, - 1100, 10, MONS_MOTTLED_DRAGON, MH_NATURAL, -3, + 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, @@ -1528,7 +1528,7 @@ MONS_EARTH_ELEMENTAL, '#', BROWN, "earth elemental", M_NO_FLAGS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_EARTH_ELEMENTAL, MH_NONLIVING, 5000, + 0, 10, MONS_EARTH_ELEMENTAL, MONS_EARTH_ELEMENTAL, MH_NONLIVING, 5000, { 40, 0, 0, 0 }, { 6, 5, 5, 0 }, 14, 4, 6, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1540,7 +1540,7 @@ MONS_FIRE_ELEMENTAL, '#', YELLOW, "fire elemental", M_FLIES, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC, - 0, 10, MONS_FIRE_ELEMENTAL, MH_NONLIVING, 5000, + 0, 10, MONS_EARTH_ELEMENTAL, MONS_FIRE_ELEMENTAL, MH_NONLIVING, 5000, { 5, 0, 0, 0 }, { 6, 3, 5, 0 }, 4, 12, 13, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1552,7 +1552,7 @@ MONS_AIR_ELEMENTAL, 'v', LIGHTGREY, "air elemental", M_LEVITATE | M_SEE_INVIS | M_FLIES, MR_RES_ELEC | MR_RES_POISON, - 0, 5, MONS_AIR_ELEMENTAL, MH_NONLIVING, 5000, + 0, 5, MONS_EARTH_ELEMENTAL, MONS_AIR_ELEMENTAL, MH_NONLIVING, 5000, { 15, 0, 0, 0 }, { 6, 3, 5, 0 }, 2, 18, 25, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1566,7 +1566,7 @@ MONS_ICE_FIEND, '1', WHITE, "Ice Fiend", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_FROZEN | M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 10, MONS_ICE_FIEND, MH_DEMONIC, -12, + 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, @@ -1578,7 +1578,7 @@ MONS_SHADOW_FIEND, '1', DARKGREY, "Shadow Fiend", M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_SHADOW_FIEND, MH_DEMONIC, -13, + 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, @@ -1590,7 +1590,7 @@ MONS_BROWN_SNAKE, 'S', BROWN, "brown snake", M_COLD_BLOOD | M_AMPHIBIOUS, MR_RES_POISON, - 300, 10, MONS_BROWN_SNAKE, MH_NATURAL, -3, + 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, @@ -1602,7 +1602,7 @@ MONS_GIANT_LIZARD, 'l', GREEN, "giant lizard", M_COLD_BLOOD, MR_NO_FLAGS, - 600, 10, MONS_GIANT_LIZARD, MH_NATURAL, -3, + 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, @@ -1614,7 +1614,7 @@ MONS_SPECTRAL_WARRIOR, 'W', LIGHTGREEN, "spectral warrior", M_LEVITATE | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 13, MONS_SPECTRAL_WARRIOR, MH_UNDEAD, -6, + 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, @@ -1626,7 +1626,7 @@ MONS_PULSATING_LUMP, 'J', RED, "pulsating lump", M_SEE_INVIS, MR_RES_POISON, - 0, 3, MONS_PULSATING_LUMP, MH_NATURAL, -3, + 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, @@ -1638,7 +1638,7 @@ MONS_STORM_DRAGON, 'D', LIGHTBLUE, "storm dragon", M_SPELLCASTER | M_FLIES, MR_RES_ELEC | MR_RES_COLD, - 2800, 12, MONS_STORM_DRAGON, MH_NATURAL, -5, + 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, @@ -1650,7 +1650,7 @@ MONS_YAKTAUR, 'c', LIGHTRED, "yaktaur", M_WARM_BLOOD, MR_NO_FLAGS, - 2000, 10, MONS_YAKTAUR, MH_NATURAL, -3, + 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, @@ -1662,7 +1662,7 @@ MONS_DEATH_YAK, 'Y', DARKGREY, "death yak", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 1500, 10, MONS_DEATH_YAK, MH_NATURAL, -5, + 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, @@ -1674,7 +1674,7 @@ MONS_ROCK_TROLL, 'T', LIGHTGREY, "rock troll", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 2200, 11, MONS_ROCK_TROLL, MH_NATURAL, -4, + 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, @@ -1686,7 +1686,7 @@ MONS_STONE_GIANT, 'C', LIGHTGREY, "stone giant", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 3000, 10, MONS_STONE_GIANT, MH_NATURAL, -4, + 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, @@ -1698,7 +1698,7 @@ MONS_FLAYED_GHOST, 'p', RED, "flayed ghost", M_FLIES | M_EVIL, MR_RES_POISON, - 0, 10, MONS_FLAYED_GHOST, MH_UNDEAD, -4, + 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, @@ -1710,7 +1710,7 @@ MONS_BUMBLEBEE, 'k', RED, "bumblebee", M_FLIES, MR_VUL_POISON, - 300, 10, MONS_BUMBLEBEE, MH_NATURAL, -3, + 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, @@ -1722,7 +1722,7 @@ MONS_REDBACK, 's', RED, "redback", M_NO_FLAGS, MR_VUL_POISON, - 1000, 14, MONS_REDBACK, MH_NATURAL, -3, + 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, @@ -1732,9 +1732,9 @@ { MONS_INSUBSTANTIAL_WISP, 'p', LIGHTGREY, "insubstantial wisp", - M_LEVITATE, + M_LEVITATE | M_SPECIAL_ABILITY, MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 0, 17, MONS_INSUBSTANTIAL_WISP, MH_NONLIVING, 5000, + 0, 17, MONS_INSUBSTANTIAL_WISP, MONS_INSUBSTANTIAL_WISP, MH_NONLIVING, 5000, { 12, 0, 0, 0 }, { 6, 1, 2, 0 }, 20, 20, 10, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_MOAN, I_PLANT, @@ -1746,7 +1746,7 @@ MONS_VAPOUR, '#', LIGHTGREY, "vapour", M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED, MR_RES_ELEC | MR_RES_POISON, - 0, 21, MONS_VAPOUR, MH_NONLIVING, 5000, + 0, 21, MONS_VAPOUR, MONS_VAPOUR, MH_NONLIVING, 5000, { 0, 0, 0, 0 }, { 12, 2, 3, 0 }, 0, 12, 10, 7, MST_STORM_DRAGON, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1758,7 +1758,7 @@ MONS_OGRE_MAGE, 'O', MAGENTA, "ogre-mage", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_EVIL, MR_RES_ELEC, - 0, 16, MONS_OGRE, MH_NATURAL, -6, + 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, @@ -1770,7 +1770,7 @@ MONS_SPINY_WORM, 'w', DARKGREY, "spiny worm", M_NO_FLAGS, MR_VUL_POISON, - 1300, 13, MONS_SPINY_WORM, MH_NATURAL, -3, + 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, @@ -1784,7 +1784,7 @@ MONS_DANCING_WEAPON, '(', BLACK, "dancing weapon", M_LEVITATE, MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_DANCING_WEAPON, MH_NONLIVING, 5000, + 0, 10, MONS_DANCING_WEAPON, MONS_DANCING_WEAPON, MH_NONLIVING, 5000, { 30, 0, 0, 0 }, { 15, 0, 0, 15 }, 10, 20, 15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -1796,7 +1796,7 @@ MONS_TITAN, 'C', MAGENTA, "titan", M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_RES_ELEC, - 3500, 12, MONS_TITAN, MH_NATURAL, -7, + 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, @@ -1808,7 +1808,7 @@ MONS_GOLDEN_DRAGON, 'D', YELLOW, "golden dragon", M_SPELLCASTER | M_FLIES | M_SEE_INVIS, MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 3000, 17, MONS_GOLDEN_DRAGON, MH_NATURAL, -8, + 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, @@ -1822,7 +1822,7 @@ MONS_ELF, 'e', DARKGREY, "elf", M_WARM_BLOOD, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -3, + 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, @@ -1836,9 +1836,9 @@ // more intuitively know that this isn't a regular lizard. -- bwr { MONS_LINDWURM, 'd', LIGHTGREEN, "lindwurm", - M_NO_FLAGS, + M_SPECIAL_ABILITY, MR_NO_FLAGS, - 1000, 11, MONS_LINDWURM, MH_NATURAL, -3, + 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, @@ -1850,7 +1850,7 @@ MONS_ELEPHANT_SLUG, 'm', LIGHTGREY, "elephant slug", M_NO_SKELETON, MR_VUL_POISON, - 1500, 10, MONS_ELEPHANT_SLUG, MH_NATURAL, -3, + 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, @@ -1862,7 +1862,7 @@ MONS_WAR_DOG, 'h', CYAN, "war dog", M_SEE_INVIS | M_WARM_BLOOD, MR_NO_FLAGS, - 350, 10, MONS_WAR_DOG, MH_NATURAL, -3, + 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, @@ -1874,7 +1874,7 @@ MONS_GREY_RAT, 'r', LIGHTGREY, "grey rat", M_WARM_BLOOD, MR_NO_FLAGS, - 250, 10, MONS_GREY_RAT, MH_NATURAL, -3, + 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, @@ -1886,7 +1886,7 @@ MONS_GREEN_RAT, 'r', LIGHTGREEN, "green rat", M_WARM_BLOOD, MR_NO_FLAGS, - 250, 10, MONS_GREEN_RAT, MH_NATURAL, -3, + 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, @@ -1898,7 +1898,7 @@ MONS_ORANGE_RAT, 'r', LIGHTRED, "orange rat", M_WARM_BLOOD, MR_NO_FLAGS, - 250, 10, MONS_ORANGE_RAT, MH_NATURAL, -3, + 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, @@ -1910,7 +1910,7 @@ MONS_BLACK_SNAKE, 'S', DARKGREY, "black snake", M_COLD_BLOOD, MR_RES_POISON, - 500, 12, MONS_BLACK_SNAKE, MH_NATURAL, -3, + 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, @@ -1922,7 +1922,7 @@ MONS_SHEEP, 'Y', LIGHTGREY, "sheep", M_WARM_BLOOD, MR_NO_FLAGS, - 1200, 10, MONS_SHEEP, MH_NATURAL, -3, + 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, @@ -1934,7 +1934,7 @@ MONS_GHOUL, 'n', RED, "ghoul", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 500, 12, MONS_GHOUL, MH_UNDEAD, -5, + 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, @@ -1946,7 +1946,7 @@ MONS_HOG, 'h', LIGHTRED, "hog", M_WARM_BLOOD, MR_NO_FLAGS, - 700, 10, MONS_HOG, MH_NATURAL, -3, + 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, @@ -1958,7 +1958,7 @@ MONS_GIANT_MOSQUITO, 'y', DARKGREY, "giant mosquito", M_FLIES, MR_VUL_POISON, - 100, 10, MONS_GIANT_MOSQUITO, MH_NATURAL, -3, + 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, @@ -1970,7 +1970,7 @@ MONS_GIANT_CENTIPEDE, 's', GREEN, "giant centipede", M_NO_FLAGS, MR_VUL_POISON, - 350, 10, MONS_GIANT_CENTIPEDE, MH_NATURAL, -3, + 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, @@ -1984,7 +1984,7 @@ MONS_IRON_TROLL, 'T', CYAN, "iron troll", M_WARM_BLOOD | M_EVIL, MR_RES_FIRE | MR_RES_COLD, - 2400, 10, MONS_IRON_TROLL, MH_NATURAL, -5, + 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, @@ -1996,8 +1996,8 @@ MONS_NAGA, 'N', GREEN, "naga", M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD, MR_RES_POISON, - 750, 10, MONS_NAGA, MH_NATURAL, -6, - { 6, 0, 0, 0 }, + 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 @@ -2008,7 +2008,7 @@ MONS_FIRE_GIANT, 'C', RED, "fire giant", M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_RES_FIRE, - 2400, 11, MONS_FIRE_GIANT, MH_NATURAL, -4, + 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, @@ -2020,7 +2020,7 @@ MONS_FROST_GIANT, 'C', LIGHTBLUE, "frost giant", M_SPELLCASTER | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_RES_COLD, - 2600, 11, MONS_FROST_GIANT, MH_NATURAL, -4, + 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, @@ -2029,10 +2029,10 @@ , { - MONS_FIREDRAKE, 'd', RED, "firedrake", - M_FLIES, + MONS_FIREDRAKE, 'l', RED, "firedrake", + M_FLIES | M_SPECIAL_ABILITY, MR_RES_FIRE, - 900, 10, MONS_FIREDRAKE, MH_NATURAL, -3, + 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, @@ -2044,7 +2044,7 @@ MONS_SHADOW_DRAGON, 'D', DARKGREY, "shadow dragon", M_SPELLCASTER | M_FLIES | M_SEE_INVIS, MR_RES_POISON | MR_RES_COLD, - 2000, 12, MONS_SHADOW_DRAGON, MH_NATURAL, -5, + 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, @@ -2055,7 +2055,7 @@ MONS_YELLOW_SNAKE, 'S', YELLOW, "yellow snake", M_COLD_BLOOD, MR_RES_POISON, - 400, 10, MONS_YELLOW_SNAKE, MH_NATURAL, -3, + 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, @@ -2067,7 +2067,7 @@ MONS_GREY_SNAKE, 'S', LIGHTGREY, "grey snake", M_COLD_BLOOD, MR_NO_FLAGS, - 600, 10, MONS_GREY_SNAKE, MH_NATURAL, -3, + 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, @@ -2079,7 +2079,7 @@ MONS_DEEP_TROLL, 'T', DARKGREY, "deep troll", M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 1500, 12, MONS_DEEP_TROLL, MH_NATURAL, -3, + 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, @@ -2091,7 +2091,7 @@ MONS_GIANT_BLOWFLY, 'y', LIGHTGREY, "giant blowfly", M_FLIES, MR_VUL_POISON, - 200, 10, MONS_GIANT_BLOWFLY, MH_NATURAL, -3, + 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, @@ -2103,7 +2103,7 @@ MONS_RED_WASP, 'y', RED, "red wasp", M_FLIES, MR_VUL_POISON, - 400, 14, MONS_RED_WASP, MH_NATURAL, -3, + 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, @@ -2115,8 +2115,8 @@ MONS_SWAMP_DRAGON, 'D', BROWN, "swamp dragon", M_SPELLCASTER | M_FLIES, MR_RES_POISON, - 1900, 11, MONS_SWAMP_DRAGON, MH_NATURAL, -3, - { 13, 9, 9, 0 }, + 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 @@ -2124,11 +2124,11 @@ , { - MONS_SWAMP_DRAKE, 'd', BROWN, "swamp drake", + MONS_SWAMP_DRAKE, 'l', BROWN, "swamp drake", M_SPELLCASTER | M_FLIES | M_EVIL, MR_RES_POISON, - 900, 11, MONS_SWAMP_DRAKE, MH_NATURAL, -3, - { 11, 0, 0, 0 }, + 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 @@ -2136,10 +2136,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_NO_FLAGS, MR_VUL_POISON, - 900, 10, MONS_SOLDIER_ANT, MH_NATURAL, -3, + 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, @@ -2151,7 +2163,7 @@ MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 1600, 10, MONS_HILL_GIANT, MH_NATURAL, -3, + 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, @@ -2163,7 +2175,7 @@ MONS_QUEEN_ANT, 'Q', DARKGREY, "queen ant", M_NO_FLAGS, MR_VUL_POISON, - 1200, 10, MONS_QUEEN_ANT, MH_NATURAL, -3, + 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, @@ -2175,7 +2187,7 @@ MONS_ANT_LARVA, 'w', LIGHTGREY, "ant larva", M_NO_SKELETON, MR_VUL_POISON, - 350, 5, MONS_ANT_LARVA, MH_NATURAL, -3, + 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, @@ -2188,7 +2200,7 @@ MONS_GIANT_FROG, 'F', GREEN, "giant frog", M_COLD_BLOOD | M_AMPHIBIOUS, MR_NO_FLAGS, - 500, 10, MONS_GIANT_FROG, MH_NATURAL, -3, + 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, @@ -2200,7 +2212,7 @@ MONS_GIANT_BROWN_FROG, 'F', BROWN, "giant brown frog", M_COLD_BLOOD | M_AMPHIBIOUS, MR_NO_FLAGS, - 890, 10, MONS_GIANT_BROWN_FROG, MH_NATURAL, -3, + 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, @@ -2212,7 +2224,7 @@ MONS_SPINY_FROG, 'F', YELLOW, "spiny frog", M_COLD_BLOOD | M_AMPHIBIOUS, MR_RES_POISON, - 1000, 10, MONS_SPINY_FROG, MH_NATURAL, -3, + 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, @@ -2222,9 +2234,9 @@ { MONS_BLINK_FROG, 'F', LIGHTGREEN, "blink frog", - M_COLD_BLOOD | M_AMPHIBIOUS, + M_COLD_BLOOD | M_AMPHIBIOUS | M_SPECIAL_ABILITY, MR_NO_FLAGS, - 800, 12, MONS_BLINK_FROG, MH_NATURAL, -5, + 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, @@ -2235,7 +2247,7 @@ MONS_GIANT_COCKROACH, 'a', BROWN, "giant cockroach", M_NO_FLAGS, MR_NO_FLAGS, - 250, 10, MONS_GIANT_COCKROACH, MH_NATURAL, -1, + 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, @@ -2246,7 +2258,7 @@ MONS_SMALL_SNAKE, 'S', LIGHTGREEN, "small snake", M_COLD_BLOOD, MR_NO_FLAGS, - 100, 13, MONS_SMALL_SNAKE, MH_NATURAL, -1, + 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, @@ -2258,7 +2270,7 @@ MONS_WHITE_IMP, '5', WHITE, "white imp", M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL, MR_RES_COLD, - 0, 10, MONS_WHITE_IMP, MH_DEMONIC, -3, + 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, @@ -2270,7 +2282,7 @@ MONS_LEMURE, '5', YELLOW, "lemure", M_EVIL, MR_RES_POISON, - 0, 10, MONS_LEMURE, MH_DEMONIC, -3, + 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, @@ -2282,7 +2294,7 @@ MONS_UFETUBUS, '5', LIGHTCYAN, "ufetubus", M_EVIL, MR_VUL_FIRE | MR_RES_COLD, - 0, 10, MONS_UFETUBUS, MH_DEMONIC, -3, + 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, @@ -2294,7 +2306,7 @@ MONS_MANES, '5', LIGHTRED, "manes", M_EVIL, MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, - 0, 10, MONS_MANES, MH_DEMONIC, -3, + 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, @@ -2306,7 +2318,7 @@ MONS_MIDGE, '5', LIGHTGREEN, "midge", M_FLIES | M_EVIL, MR_RES_POISON, - 0, 10, MONS_MIDGE, MH_DEMONIC, -3, + 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, @@ -2318,7 +2330,7 @@ MONS_NEQOXEC, '3', MAGENTA, "neqoxec", M_SPELLCASTER | M_LEVITATE | M_EVIL, MR_RES_POISON, - 0, 12, MONS_NEQOXEC, MH_DEMONIC, -6, + 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, @@ -2330,7 +2342,7 @@ MONS_ORANGE_DEMON, '3', LIGHTRED, "orange demon", M_EVIL, MR_NO_FLAGS, - 0, 12, MONS_ORANGE_DEMON, MH_DEMONIC, -6, + 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, @@ -2342,7 +2354,7 @@ MONS_HELLWING, '3', LIGHTGREY, "hellwing", M_SPELLCASTER | M_FLIES | M_EVIL, MR_RES_POISON, - 0, 12, MONS_HELLWING, MH_DEMONIC, -6, + 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, @@ -2354,7 +2366,7 @@ MONS_SMOKE_DEMON, '4', LIGHTGREY, "smoke demon", M_SPELLCASTER | M_FLIES | M_EVIL, MR_RES_POISON | MR_RES_FIRE, - 0, 12, MONS_SMOKE_DEMON, MH_DEMONIC, -6, + 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, @@ -2366,7 +2378,7 @@ MONS_YNOXINUL, '3', CYAN, "ynoxinul", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD, - 0, 12, MONS_YNOXINUL, MH_DEMONIC, -6, + 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, @@ -2378,7 +2390,7 @@ MONS_EXECUTIONER, '1', LIGHTGREY, "Executioner", M_SPELLCASTER | M_SEE_INVIS | M_EVIL, MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, - 0, 14, MONS_EXECUTIONER, MH_DEMONIC, -9, + 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, @@ -2390,7 +2402,7 @@ MONS_GREEN_DEATH, '1', GREEN, "Green Death", M_SPELLCASTER | M_SEE_INVIS | M_EVIL, MR_RES_POISON, - 0, 14, MONS_GREEN_DEATH, MH_DEMONIC, -9, + 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, @@ -2402,7 +2414,7 @@ MONS_BLUE_DEATH, '1', BLUE, "Blue Death", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 14, MONS_BLUE_DEATH, MH_DEMONIC, -9, + 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, @@ -2414,7 +2426,7 @@ MONS_BALRUG, '1', RED, "Balrug", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD, - 0, 14, MONS_BALRUG, MH_DEMONIC, -9, + 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, @@ -2426,7 +2438,7 @@ MONS_CACODEMON, '1', YELLOW, "Cacodemon", M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_ELEC, - 0, 14, MONS_CACODEMON, MH_DEMONIC, -9, + 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, @@ -2439,7 +2451,7 @@ MONS_DEMONIC_CRAWLER, '3', DARKGREY, "demonic crawler", M_SEE_INVIS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE, - 0, 12, MONS_DEMONIC_CRAWLER, MH_DEMONIC, -6, + 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, @@ -2451,7 +2463,7 @@ MONS_SUN_DEMON, '2', YELLOW, "sun demon", M_SEE_INVIS | M_LEVITATE | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_VUL_COLD | MR_RES_HELLFIRE, - 0, 14, MONS_SUN_DEMON, MH_DEMONIC, -6, + 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, @@ -2463,7 +2475,7 @@ MONS_SHADOW_IMP, '5', DARKGREY, "shadow imp", M_SPELLCASTER | M_FLIES | M_SPEAKS | M_EVIL, MR_RES_COLD | MR_RES_POISON, - 0, 11, MONS_SHADOW_IMP, MH_DEMONIC, -3, + 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, @@ -2475,7 +2487,7 @@ MONS_SHADOW_DEMON, '3', DARKGREY, "shadow demon", M_SEE_INVIS | M_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 12, MONS_SHADOW_DEMON, MH_DEMONIC, -7, + 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, @@ -2487,7 +2499,7 @@ MONS_LOROCYPROCA, '2', BLUE, "Lorocyproca", M_SEE_INVIS | M_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE | MR_RES_ELEC, - 0, 12, MONS_LOROCYPROCA, MH_DEMONIC, -7, + 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, @@ -2499,7 +2511,7 @@ MONS_SHADOW_WRAITH, 'W', BLUE, "shadow wraith", M_LEVITATE | M_SEE_INVIS | M_INVIS | M_EVIL, MR_RES_POISON, - 0, 15, MONS_SHADOW_WRAITH, MH_UNDEAD, -8, + 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, @@ -2511,7 +2523,7 @@ MONS_GIANT_AMOEBA, 'J', BLUE, "giant amoeba", M_NO_SKELETON | M_SEE_INVIS | M_AMPHIBIOUS, MR_RES_POISON, - 1000, 10, MONS_GIANT_AMOEBA, MH_NATURAL, -3, + 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, @@ -2523,7 +2535,7 @@ MONS_GIANT_SLUG, 'm', GREEN, "giant slug", M_NO_SKELETON | M_AMPHIBIOUS, MR_NO_FLAGS, - 700, 10, MONS_GIANT_SLUG, MH_NATURAL, -3, + 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, @@ -2535,7 +2547,7 @@ MONS_GIANT_SNAIL, 'm', LIGHTGREEN, "giant snail", M_NO_SKELETON | M_AMPHIBIOUS, MR_NO_FLAGS, - 900, 10, MONS_GIANT_SNAIL, MH_NATURAL, -3, + 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, @@ -2547,7 +2559,7 @@ MONS_SPATIAL_VORTEX, 'v', BLACK, "spatial vortex", M_LEVITATE | M_CONFUSED, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 5, MONS_SPATIAL_VORTEX, MH_NONLIVING, 5000, + 0, 5, MONS_FIRE_VORTEX, MONS_SPATIAL_VORTEX, MH_NONLIVING, 5000, { 50, 0, 0, 0 }, { 6, 6, 6, 0 }, 0, 5, 15, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -2557,9 +2569,9 @@ { MONS_PIT_FIEND, '1', BROWN, "Pit Fiend", - M_FLIES | M_SEE_INVIS | M_EVIL, + 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_PIT_FIEND, MH_DEMONIC, -12, + 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, @@ -2571,7 +2583,7 @@ MONS_BORING_BEETLE, 'B', BROWN, "boring beetle", M_NO_FLAGS, MR_VUL_POISON, - 1300, 10, MONS_BORING_BEETLE, MH_NATURAL, -3, + 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, @@ -2583,7 +2595,7 @@ MONS_GARGOYLE, 'g', DARKGREY, "gargoyle", M_FLIES, MR_RES_POISON | MR_RES_ELEC, - 0, 12, MONS_GARGOYLE, MH_NONLIVING, -6, + 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, @@ -2596,7 +2608,7 @@ MONS_METAL_GARGOYLE, 'g', CYAN, "metal gargoyle", M_FLIES, MR_RES_POISON | MR_RES_ELEC, - 0, 12, MONS_METAL_GARGOYLE, MH_NONLIVING, -6, + 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, @@ -2609,7 +2621,7 @@ MONS_MOLTEN_GARGOYLE, 'g', RED, "molten gargoyle", M_FLIES, MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE, - 0, 12, MONS_MOLTEN_GARGOYLE, MH_NONLIVING, -6, + 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, @@ -2625,7 +2637,7 @@ MONS_MNOLEG, '&', LIGHTGREEN, "Mnoleg", M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE, - 0, 25, MONS_MNOLEG, MH_DEMONIC, 5000, + 0, 25, MONS_MNOLEG, MONS_MNOLEG, MH_DEMONIC, 5000, { 23, 23, 0, 0 }, { 17, 0, 0, 199 }, 10, 13, 13, 7, MST_MNOLEG, CE_CONTAMINATED, Z_NOZOMBIE, S_BUZZ, I_HIGH, @@ -2637,7 +2649,7 @@ MONS_LOM_LOBON, '&', LIGHTBLUE, "Lom Lobon", M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 25, MONS_LOM_LOBON, MH_DEMONIC, 5000, + 0, 25, MONS_LOM_LOBON, MONS_LOM_LOBON, MH_DEMONIC, 5000, { 40, 0, 0, 0 }, { 19, 0, 0, 223 }, 10, 7, 8, 7, MST_LOM_LOBON, CE_CONTAMINATED, Z_NOZOMBIE, S_SCREAM, I_HIGH, @@ -2649,7 +2661,7 @@ MONS_CEREBOV, '&', RED, "Cerebov", M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE, - 0, 25, MONS_CEREBOV, MH_DEMONIC, -6, + 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, @@ -2661,7 +2673,7 @@ MONS_GLOORX_VLOQ, '&', DARKGREY, "Gloorx Vloq", M_LEVITATE | M_SEE_INVIS | M_SPELLCASTER | M_SPEAKS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, - 0, 25, MONS_GLOORX_VLOQ, MH_DEMONIC, -14, + 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, @@ -2680,8 +2692,8 @@ MONS_NAGA_MAGE, 'N', LIGHTRED, "naga mage", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, MR_RES_POISON, - 750, 13, MONS_NAGA, MH_NATURAL, -6, - { 5, 0, 0, 0 }, + 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 @@ -2692,8 +2704,8 @@ MONS_NAGA_WARRIOR, 'N', BLUE, "naga warrior", M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD, MR_RES_POISON, - 750, 12, MONS_NAGA, MH_NATURAL, -6, - { 11, 0, 0, 0 }, + 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 @@ -2704,7 +2716,7 @@ MONS_ORC_WARLORD, 'o', RED, "orc warlord", M_WARM_BLOOD | M_EVIL, MR_NO_FLAGS, - 600, 15, MONS_ORC, MH_NATURAL, -3, + 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, @@ -2716,7 +2728,7 @@ MONS_DEEP_ELF_SOLDIER, 'e', CYAN, "deep elf soldier", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2728,7 +2740,7 @@ MONS_DEEP_ELF_FIGHTER, 'e', LIGHTBLUE, "deep elf fighter", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2740,7 +2752,7 @@ MONS_DEEP_ELF_KNIGHT, 'e', BLUE, "deep elf knight", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2752,7 +2764,7 @@ MONS_DEEP_ELF_MAGE, 'e', LIGHTRED, "deep elf mage", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_RES_ELEC, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2764,7 +2776,7 @@ MONS_DEEP_ELF_SUMMONER, 'e', YELLOW, "deep elf summoner", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2776,7 +2788,7 @@ MONS_DEEP_ELF_CONJURER, 'e', LIGHTGREEN, "deep elf conjurer", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_RES_ELEC, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2788,7 +2800,7 @@ MONS_DEEP_ELF_PRIEST, 'e', LIGHTGREY, "deep elf priest", M_SPELLCASTER | M_PRIEST | M_WARM_BLOOD, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2800,7 +2812,7 @@ MONS_DEEP_ELF_HIGH_PRIEST, 'e', DARKGREY, "deep elf high priest", M_SPELLCASTER | M_SPEAKS | M_PRIEST | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2812,7 +2824,7 @@ MONS_DEEP_ELF_DEMONOLOGIST, 'e', MAGENTA, "deep elf demonologist", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2824,7 +2836,7 @@ MONS_DEEP_ELF_ANNIHILATOR, 'e', GREEN, "deep elf annihilator", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS, MR_RES_ELEC, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2836,7 +2848,7 @@ MONS_DEEP_ELF_SORCERER, 'e', RED, "deep elf sorcerer", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_SPEAKS, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2848,7 +2860,7 @@ MONS_DEEP_ELF_DEATH_MAGE, 'e', WHITE, "deep elf death mage", M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 450, 10, MONS_ELF, MH_NATURAL, -6, + 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, @@ -2860,7 +2872,7 @@ MONS_BROWN_OOZE, 'J', BROWN, "brown ooze", M_NO_SKELETON | M_SEE_INVIS, MR_RES_POISON, - 0, 11, MONS_BROWN_OOZE, MH_NATURAL, -7, + 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, @@ -2872,7 +2884,7 @@ MONS_AZURE_JELLY, 'J', LIGHTBLUE, "azure jelly", M_NO_SKELETON | M_SEE_INVIS, MR_RES_POISON | MR_RES_COLD | MR_VUL_FIRE | MR_RES_ELEC, - 0, 11, MONS_AZURE_JELLY, MH_NATURAL, -4, + 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, @@ -2884,7 +2896,7 @@ MONS_DEATH_OOZE, 'J', DARKGREY, "death ooze", M_NO_SKELETON | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 13, MONS_DEATH_OOZE, MH_UNDEAD, -8, + 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, @@ -2894,9 +2906,9 @@ { MONS_ACID_BLOB, 'J', LIGHTGREEN, "acid blob", - M_NO_SKELETON | M_SEE_INVIS, + M_NO_SKELETON | M_SEE_INVIS | M_SPECIAL_ABILITY, MR_RES_POISON, - 0, 12, MONS_ACID_BLOB, MH_NATURAL, -7, + 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, @@ -2908,7 +2920,7 @@ MONS_ROYAL_JELLY, 'J', YELLOW, "royal jelly", M_NO_SKELETON | M_SEE_INVIS, MR_RES_POISON, - 0, 20, MONS_ROYAL_JELLY, MH_NATURAL, -7, + 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, @@ -2920,7 +2932,7 @@ MONS_TERENCE, '@', LIGHTCYAN, "Terence", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -3, + 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, @@ -2932,7 +2944,7 @@ MONS_JESSICA, '@', LIGHTGREY, "Jessica", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -3, + 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, @@ -2944,7 +2956,7 @@ MONS_IJYB, 'g', BLUE, "Ijyb", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 5, MONS_GOBLIN, MH_NATURAL, -3, + 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, @@ -2956,7 +2968,7 @@ MONS_SIGMUND, '@', YELLOW, "Sigmund", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -3, + 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, @@ -2968,7 +2980,7 @@ MONS_BLORK_THE_ORC, 'o', BROWN, "Blork the orc", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_ORC, MH_NATURAL, -4, + 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, @@ -2980,7 +2992,7 @@ MONS_EDMUND, '@', RED, "Edmund", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -4, + 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, @@ -2992,7 +3004,7 @@ MONS_PSYCHE, '@', LIGHTMAGENTA, "Psyche", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -4, + 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, @@ -3004,7 +3016,7 @@ MONS_EROLCHA, 'O', LIGHTBLUE, "Erolcha", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS | M_EVIL, MR_RES_ELEC, - 0, 20, MONS_OGRE, MH_NATURAL, -7, + 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, @@ -3016,7 +3028,7 @@ MONS_DONALD, '@', BLUE, "Donald", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3028,7 +3040,7 @@ MONS_URUG, 'o', RED, "Urug", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_ORC, MH_NATURAL, -5, + 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, @@ -3040,7 +3052,7 @@ MONS_MICHAEL, '@', LIGHTGREY, "Michael", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3052,7 +3064,7 @@ MONS_JOSEPH, '@', CYAN, "Joseph", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3064,7 +3076,7 @@ MONS_SNORG, 'T', GREEN, "Snorg", M_WARM_BLOOD | M_SPEAKS | M_EVIL, MR_NO_FLAGS, - 0, 20, MONS_TROLL, MH_NATURAL, -6, + 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, @@ -3076,7 +3088,7 @@ MONS_ERICA, '@', MAGENTA, "Erica", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3088,7 +3100,7 @@ MONS_JOSEPHINE, '@', WHITE, "Josephine", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3100,7 +3112,7 @@ MONS_HAROLD, '@', LIGHTGREEN, "Harold", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3112,7 +3124,7 @@ MONS_NORBERT, '@', BROWN, "Norbert", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3124,7 +3136,7 @@ MONS_JOZEF, '@', LIGHTMAGENTA, "Jozef", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3136,7 +3148,7 @@ MONS_AGNES, '@', LIGHTBLUE, "Agnes", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3148,7 +3160,7 @@ MONS_MAUD, '@', RED, "Maud", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3160,7 +3172,7 @@ MONS_LOUISE, '@', BLUE, "Louise", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD, MR_RES_ELEC, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3172,7 +3184,7 @@ MONS_FRANCIS, '@', YELLOW, "Francis", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3184,7 +3196,7 @@ MONS_FRANCES, '@', YELLOW, "Frances", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3196,7 +3208,7 @@ MONS_RUPERT, '@', RED, "Rupert", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, MR_RES_ELEC, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3208,7 +3220,7 @@ MONS_WAYNE, '@', YELLOW, "Wayne", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3220,7 +3232,7 @@ MONS_DUANE, '@', YELLOW, "Duane", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3230,9 +3242,9 @@ { MONS_XTAHUA, 'D', RED, "Xtahua", - M_SPEAKS | M_SEE_INVIS | M_FLIES, + M_SPEAKS | M_SEE_INVIS | M_FLIES | M_SPECIAL_ABILITY, MR_RES_POISON | MR_RES_FIRE | MR_VUL_COLD, - 0, 20, MONS_DRAGON, MH_NATURAL, -7, + 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, @@ -3244,10 +3256,10 @@ MONS_NORRIS, '@', LIGHTRED, "Norris", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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 } , @@ -3256,7 +3268,7 @@ MONS_ADOLF, '@', DARKGREY, "Adolf", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS | M_EVIL, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3268,7 +3280,7 @@ MONS_MARGERY, '@', RED, "Margery", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS | M_WARM_BLOOD | M_SEE_INVIS, MR_NO_FLAGS, - 0, 20, MONS_HUMAN, MH_NATURAL, -5, + 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, @@ -3280,7 +3292,7 @@ MONS_BORIS, 'L', RED, "Boris", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_SPEAKS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, - 0, 23, MONS_LICH, MH_UNDEAD, -11, + 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, @@ -3293,7 +3305,7 @@ MONS_GERYON, '&', GREEN, "Geryon", M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, MR_NO_FLAGS, - 0, 25, MONS_GERYON, MH_DEMONIC, -6, + 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, @@ -3305,7 +3317,7 @@ MONS_DISPATER, '&', MAGENTA, "Dispater", M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, - 0, 25, MONS_DISPATER, MH_DEMONIC, -10, + 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, @@ -3317,7 +3329,7 @@ MONS_ASMODEUS, '&', LIGHTMAGENTA, "Asmodeus", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_SPEAKS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE, - 0, 25, MONS_ASMODEUS, MH_DEMONIC, -12, + 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, @@ -3330,7 +3342,7 @@ MONS_ANTAEUS, 'C', LIGHTCYAN, "Antaeus", M_SPELLCASTER | M_SPEAKS, MR_RES_ELEC | MR_VUL_FIRE | MR_RES_COLD, - 0, 25, MONS_ANTAEUS, MH_DEMONIC, -9, + 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, @@ -3342,7 +3354,7 @@ MONS_ERESHKIGAL, '&', WHITE, "Ereshkigal", M_SPELLCASTER | M_SEE_INVIS | M_SPEAKS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_COLD, - 0, 25, MONS_ERESHKIGAL, MH_DEMONIC, -10, + 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, @@ -3354,7 +3366,7 @@ MONS_ANCIENT_LICH, 'L', DARKGREY, "ancient lich", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_FIRE | MR_RES_ELEC, - 0, 20, MONS_LICH, MH_UNDEAD, -14, + 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, @@ -3367,7 +3379,7 @@ MONS_OOZE, 'J', LIGHTGREY, "ooze", M_NO_SKELETON | M_SEE_INVIS, MR_RES_POISON, - 0, 5, MONS_OOZE, MH_NATURAL, -6, + 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, @@ -3379,7 +3391,7 @@ MONS_VAULT_GUARD, '@', CYAN, "vault guard", M_WARM_BLOOD | M_SEE_INVIS, MR_NO_FLAGS, - 0, 12, MONS_HUMAN, MH_NATURAL, -3, + 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, @@ -3393,7 +3405,7 @@ MONS_CURSE_SKULL, 'z', DARKGREY, "curse skull", M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS | M_EVIL, MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD, - 0, 50, MONS_CURSE_SKULL, MH_UNDEAD, 5000, + 0, 50, MONS_LICH, MONS_CURSE_SKULL, MH_UNDEAD, 5000, { 0, 0, 0, 0 }, { 13, 0, 0, 66 }, 40, 3, 10, 7, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, @@ -3405,7 +3417,7 @@ MONS_VAMPIRE_KNIGHT, 'V', CYAN, "vampire knight", M_SPELLCASTER | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 13, MONS_VAMPIRE, MH_UNDEAD, -6, + 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, @@ -3417,7 +3429,7 @@ MONS_VAMPIRE_MAGE, 'V', MAGENTA, "vampire mage", M_SPELLCASTER | M_SEE_INVIS | M_FLIES | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 15, MONS_VAMPIRE, MH_UNDEAD, -6, + 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, @@ -3429,7 +3441,7 @@ MONS_SHINING_EYE, 'G', LIGHTMAGENTA, "shining eye", M_NO_SKELETON | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, MR_NO_FLAGS, - 0, 14, MONS_SHINING_EYE, MH_NATURAL, 5000, + 0, 14, MONS_SHINING_EYE, MONS_SHINING_EYE, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, 3, 1, 7, 7, MST_SHINING_EYE, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3441,8 +3453,8 @@ MONS_ORB_GUARDIAN, 'X', MAGENTA, "Orb Guardian", M_NO_SKELETON | M_SEE_INVIS, MR_NO_FLAGS, - 0, 20, MONS_ORB_GUARDIAN, MH_NATURAL, -6, - { 40, 0, 0, 0 }, + 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 @@ -3453,7 +3465,7 @@ MONS_DAEVA, 'A', YELLOW, "Daeva", M_LEVITATE | M_SPELLCASTER, MR_RES_POISON, - 0, 12, MONS_DAEVA, MH_HOLY, -8, + 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, @@ -3466,7 +3478,7 @@ MONS_SPECTRAL_THING, 'W', GREEN, "", M_LEVITATE | M_SEE_INVIS, MR_RES_POISON | MR_RES_COLD, - 0, 11, MONS_SPECTRAL_THING, MH_UNDEAD, 5000, + 0, 11, MONS_WRAITH, MONS_SPECTRAL_THING, MH_UNDEAD, 5000, { 20, 0, 0, 0 }, { 8, 3, 5, 0 }, 8, 5, 7, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3478,8 +3490,8 @@ MONS_GREATER_NAGA, 'N', RED, "greater naga", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD, MR_RES_POISON, - 750, 10, MONS_NAGA, MH_NATURAL, 5000, - { 18, 0, 0, 0 }, + 750, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, 5000, + { 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 @@ -3490,7 +3502,7 @@ MONS_SKELETAL_DRAGON, 'D', LIGHTGREY, "skeletal dragon", M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 12, MONS_SKELETAL_DRAGON, MH_UNDEAD, -4, + 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, @@ -3502,7 +3514,7 @@ MONS_TENTACLED_MONSTROSITY, 'X', GREEN, "tentacled monstrosity", M_SEE_INVIS | M_AMPHIBIOUS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 0, 10, MONS_TENTACLED_MONSTROSITY, MH_NATURAL, -5, + 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, @@ -3514,7 +3526,7 @@ MONS_SPHINX, 'H', LIGHTGREY, "sphinx", M_FLIES | M_SEE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD, MR_NO_FLAGS, - 0, 10, MONS_SPHINX, MH_NATURAL, -3, + 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, @@ -3526,7 +3538,7 @@ MONS_ROTTING_HULK, 'n', BROWN, "rotting hulk", M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 12, MONS_ROTTING_HULK, MH_UNDEAD, -5, + 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, @@ -3538,7 +3550,7 @@ MONS_GUARDIAN_MUMMY, 'M', YELLOW, "guardian mummy", M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 13, MONS_GUARDIAN_MUMMY, MH_UNDEAD, -5, + 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, @@ -3550,7 +3562,7 @@ MONS_GREATER_MUMMY, 'M', DARKGREY, "greater mummy", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, - 0, 20, MONS_MUMMY, MH_UNDEAD, 5000, + 0, 20, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, 5000, { 35, 0, 0, 0 }, { 15, 5, 3, 100 }, 10, 6, 10, 7, MST_MUMMY, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3562,7 +3574,7 @@ MONS_MUMMY_PRIEST, 'M', RED, "mummy priest", M_SPELLCASTER | M_PRIEST | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_COLD | MR_RES_ELEC, - 0, 16, MONS_MUMMY, MH_UNDEAD, 5000, + 0, 16, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, 5000, { 30, 0, 0, 0 }, { 10, 5, 3, 0 }, 8, 7, 9, 7, MST_MUMMY, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3574,7 +3586,7 @@ MONS_CENTAUR_WARRIOR, 'c', YELLOW, "centaur warrior", M_WARM_BLOOD, MR_NO_FLAGS, - 1500, 12, MONS_CENTAUR, MH_NATURAL, -3, + 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, @@ -3586,7 +3598,7 @@ MONS_YAKTAUR_CAPTAIN, 'c', RED, "yaktaur captain", M_WARM_BLOOD, MR_NO_FLAGS, - 2000, 10, MONS_YAKTAUR, MH_NATURAL, -3, + 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, @@ -3594,11 +3606,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, 3, + { 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 6, + { 20, 0, 0, 0 }, + { 14, 6, 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 3, + { 20, 0, 0, 0 }, + { 14, 6, 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, 5, 5, 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, + { 15, 15, 15, 0 }, + { 16, 6, 4, 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, 6, 4, 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, 5, 5, 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, 5, 5, 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_PRIEST | 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, 5, 5, 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_SEE_INVIS | M_SPEAKS | M_WARM_BLOOD, + M_SEE_INVIS | M_SPEAKS | M_WARM_BLOOD | M_SPECIAL_ABILITY, MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, - 0, 15, MONS_KILLER_KLOWN, MH_NATURAL, 5000, + 0, 15, MONS_HUMAN, MONS_KILLER_KLOWN, MH_NATURAL, 5000, { 30, 0, 0, 0 }, { 20, 5, 5, 0 }, 10, 15, 15, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_HIGH, @@ -3610,7 +3816,7 @@ MONS_ELECTRIC_GOLEM, '8', LIGHTCYAN, "electric golem", M_SPELLCASTER | M_SEE_INVIS, MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 0, 10, MONS_ELECTRIC_GOLEM, MH_NONLIVING, 5000, + 0, 10, MONS_CLAY_GOLEM, MONS_ELECTRIC_GOLEM, MH_NONLIVING, 5000, { 12, 12, 12, 12 }, { 15, 7, 4, 0 }, 5, 20, 20, 7, MST_ELECTRIC_GOLEM, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3620,9 +3826,9 @@ { MONS_BALL_LIGHTNING, '*', LIGHTCYAN, "ball lightning", - M_FLIES | M_CONFUSED | M_SPELLCASTER, + M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY, MR_RES_ELEC, - 0, 20, MONS_BALL_LIGHTNING, MH_NONLIVING, 5000, + 0, 20, MONS_BALL_LIGHTNING, MONS_BALL_LIGHTNING, MH_NONLIVING, 5000, { 5, 0, 0, 0 }, { 12, 0, 0, 1 }, 0, 10, 20, 7, MST_STORM_DRAGON, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_PLANT, @@ -3634,7 +3840,7 @@ MONS_ORB_OF_FIRE, '*', RED, "orb of fire", M_SPELLCASTER | M_FLIES | M_SEE_INVIS, MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON, - 0, 10, MONS_ORB_OF_FIRE, MH_NONLIVING, 5000, + 0, 10, MONS_ORB_OF_FIRE, MONS_ORB_OF_FIRE, MH_NONLIVING, 5000, { 0, 0, 0, 0 }, { 30, 0, 0, 150 }, 20, 20, 20, 7, MST_ORB_OF_FIRE, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, @@ -3646,7 +3852,7 @@ MONS_QUOKKA, 'r', LIGHTGREY, "quokka", M_WARM_BLOOD, MR_NO_FLAGS, - 300, 10, MONS_QUOKKA, MH_NATURAL, -1, + 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, @@ -3658,7 +3864,7 @@ MONS_EYE_OF_DEVASTATION, 'G', YELLOW, "eye of devastation", M_NO_SKELETON | M_LEVITATE | M_SPELLCASTER | M_SEE_INVIS, MR_NO_FLAGS, - 0, 11, MONS_EYE_OF_DEVASTATION, MH_NATURAL, 5000, + 0, 11, MONS_GIANT_EYEBALL, MONS_EYE_OF_DEVASTATION, MH_NATURAL, 5000, { 0, 0, 0, 0 }, { 10, 3, 5, 0 }, 12, 1, 7, 7, MST_EYE_OF_DEVASTATION, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3670,7 +3876,7 @@ MONS_MOTH_OF_WRATH, 'y', BROWN, "moth of wrath", M_FLIES, MR_NO_FLAGS, - 0, 10, MONS_MOTH_OF_WRATH, MH_NATURAL, -3, + 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, @@ -3682,7 +3888,7 @@ MONS_DEATH_COB, '%', YELLOW, "death cob", M_SPEAKS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_DEATH_COB, MH_UNDEAD, -3, + 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, @@ -3694,7 +3900,7 @@ MONS_CURSE_TOE, 'z', DARKGREY, "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_CURSE_TOE, MH_UNDEAD, 5000, + 0, 60, MONS_LICH, MONS_CURSE_TOE, MH_UNDEAD, 5000, { 0, 0, 0, 0 }, { 14, 0, 0, 77 }, 50, 1, 12, 7, MST_CURSE_SKULL, CE_NOCORPSE, Z_NOZOMBIE, S_MOAN, I_HIGH, @@ -3707,7 +3913,7 @@ MONS_GOLD_MIMIC, '$', YELLOW, "pile of gold coins", M_NO_SKELETON, MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, - 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, + 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, @@ -3719,7 +3925,7 @@ MONS_WEAPON_MIMIC, ')', BLACK, "mimic", M_NO_SKELETON, MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, - 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, + 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, @@ -3731,7 +3937,7 @@ MONS_ARMOUR_MIMIC, '[', BLACK, "mimic", M_NO_SKELETON, MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, - 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, + 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, @@ -3743,7 +3949,7 @@ MONS_SCROLL_MIMIC, '?', LIGHTGREY, "mimic", M_NO_SKELETON, MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, - 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, + 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, @@ -3755,7 +3961,7 @@ MONS_POTION_MIMIC, '!', BLACK, "mimic", M_NO_SKELETON, MR_RES_POISON | MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD, - 0, 13, MONS_GOLD_MIMIC, MH_NONLIVING, -3, + 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, @@ -3767,7 +3973,7 @@ MONS_HELL_HOG, 'h', RED, "hell-hog", M_SPELLCASTER | M_THICK_SKIN | M_EVIL, MR_NO_FLAGS, - 0, 10, MONS_HELL_HOG, MH_DEMONIC, -3, + 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, @@ -3779,7 +3985,7 @@ MONS_SERPENT_OF_HELL, 'D', RED, "Serpent of Hell", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_EVIL, MR_RES_POISON | MR_RES_HELLFIRE, - 0, 18, MONS_SERPENT_OF_HELL, MH_DEMONIC, -13, + 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, @@ -3791,7 +3997,7 @@ MONS_BOGGART, 'g', DARKGREY, "boggart", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS, MR_NO_FLAGS, - 0, 14, MONS_BOGGART, MH_NATURAL, -7, + 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, @@ -3803,7 +4009,7 @@ MONS_QUICKSILVER_DRAGON, 'D', LIGHTCYAN, "quicksilver dragon", M_SPELLCASTER | M_FLIES | M_SEE_INVIS, MR_NO_FLAGS, - 0, 14, MONS_QUICKSILVER_DRAGON, MH_NATURAL, -7, + 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, @@ -3815,7 +4021,7 @@ MONS_IRON_DRAGON, 'D', CYAN, "iron dragon", M_SPELLCASTER | M_SEE_INVIS, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 0, 14, MONS_IRON_DRAGON, MH_NATURAL, -7, + 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, @@ -3827,7 +4033,7 @@ MONS_SKELETAL_WARRIOR, 'z', CYAN, "skeletal warrior", M_SPELLCASTER | M_ACTUAL_SPELLS | M_EVIL, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_SKELETAL_WARRIOR, MH_UNDEAD, -7, + 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, @@ -3841,7 +4047,7 @@ MONS_PLAYER_GHOST, 'p', DARKGREY, "", M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES, MR_RES_POISON, - 0, 15, MONS_PLAYER_GHOST, MH_UNDEAD, -5, + 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, @@ -3854,7 +4060,7 @@ MONS_PANDEMONIUM_DEMON, '&', BLACK, "&", M_SPELLCASTER | M_SPEAKS | M_EVIL, MR_RES_POISON, - 0, 14, MONS_PANDEMONIUM_DEMON, MH_DEMONIC, -5, + 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, @@ -3867,7 +4073,7 @@ MONS_LAVA_WORM, 'w', RED, "lava worm", M_NO_FLAGS, MR_RES_FIRE | MR_VUL_COLD, - 0, 10, MONS_LAVA_WORM, MH_NATURAL, -3, + 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, @@ -3879,7 +4085,7 @@ MONS_LAVA_FISH, ';', RED, "lava fish", M_NO_FLAGS, MR_RES_FIRE | MR_VUL_COLD, - 0, 10, MONS_LAVA_FISH, MH_NATURAL, -3, + 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, @@ -3889,9 +4095,9 @@ { MONS_LAVA_SNAKE, 'S', RED, "lava snake", - M_NO_FLAGS, + M_SPECIAL_ABILITY, MR_RES_FIRE | MR_VUL_COLD, - 0, 10, MONS_LAVA_SNAKE, MH_NATURAL, -3, + 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, @@ -3903,7 +4109,7 @@ MONS_SALAMANDER, 'S', LIGHTRED, "salamander", M_WARM_BLOOD, MR_RES_FIRE | MR_VUL_COLD, - 0, 10, MONS_SALAMANDER, MH_NATURAL, -3, + 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, @@ -3918,7 +4124,7 @@ MONS_BIG_FISH, ';', LIGHTGREEN, "big fish", M_COLD_BLOOD, MR_NO_FLAGS, - 0, 10, MONS_BIG_FISH, MH_NATURAL, -3, + 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, @@ -3930,7 +4136,7 @@ MONS_GIANT_GOLDFISH, ';', LIGHTRED, "giant goldfish", M_COLD_BLOOD, MR_NO_FLAGS, - 0, 10, MONS_GIANT_GOLDFISH, MH_NATURAL, -3, + 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, @@ -3940,9 +4146,9 @@ { MONS_ELECTRICAL_EEL, ';', LIGHTBLUE, "electrical eel", - M_COLD_BLOOD, + M_COLD_BLOOD | M_SPECIAL_ABILITY, MR_RES_ELEC, - 0, 10, MONS_ELECTRICAL_EEL, MH_NATURAL, -3, + 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, @@ -3954,7 +4160,7 @@ MONS_JELLYFISH, 'J', CYAN, "jellyfish", M_NO_FLAGS, MR_RES_POISON, - 0, 10, MONS_JELLYFISH, MH_NATURAL, -3, + 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, @@ -3966,7 +4172,7 @@ MONS_WATER_ELEMENTAL, '{', LIGHTBLUE, "water elemental", M_FLIES, MR_RES_POISON | MR_VUL_FIRE | MR_RES_ELEC, - 0, 10, MONS_WATER_ELEMENTAL, MH_NONLIVING, 5000, + 0, 10, MONS_EARTH_ELEMENTAL, MONS_WATER_ELEMENTAL, MH_NONLIVING, 5000, { 25, 0, 0, 0 }, { 6, 5, 3, 0 }, 0, 7, 10, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, @@ -3978,7 +4184,7 @@ MONS_SWAMP_WORM, 'w', BROWN, "swamp worm", M_AMPHIBIOUS, MR_NO_FLAGS, - 0, 10, MONS_SWAMP_WORM, MH_NATURAL, -3, + 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, @@ -4002,7 +4208,7 @@ not think it fits into Crawl ... {dlb} MONS_SHUGGOTH, 'A', LIGHTGREEN, "shuggoth", M_NO_SKELETON | M_SEE_INVIS, MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 1000, 10, MONS_SHUGGOTH, MH_DEMONIC, 300, + 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, @@ -4015,7 +4221,7 @@ not think it fits into Crawl ... {dlb} MONS_WOLF, 'h', LIGHTGREY, "wolf", M_WARM_BLOOD | M_SEE_INVIS, //jmf: until smell exists MR_NO_FLAGS, - 450, 10, MONS_WOLF, MH_NATURAL, -3, + 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, @@ -4027,7 +4233,7 @@ not think it fits into Crawl ... {dlb} MONS_WARG, 'h', DARKGREY, "warg", M_SEE_INVIS | M_WARM_BLOOD, MR_RES_POISON, - 600, 12, MONS_WARG, MH_NATURAL, -6, + 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, @@ -4039,7 +4245,7 @@ not think it fits into Crawl ... {dlb} MONS_BEAR, 'U', BROWN, "bear", M_WARM_BLOOD, MR_NO_FLAGS, - 2000, 10, MONS_BEAR, MH_NATURAL, -3, + 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, @@ -4051,7 +4257,7 @@ not think it fits into Crawl ... {dlb} MONS_GRIZZLY_BEAR, 'U', LIGHTGREY, "grizzly bear", M_WARM_BLOOD, MR_NO_FLAGS, - 2500, 10, MONS_GRIZZLY_BEAR, MH_NATURAL, -3, + 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, @@ -4063,7 +4269,7 @@ not think it fits into Crawl ... {dlb} MONS_POLAR_BEAR, 'U', WHITE, "polar bear", M_WARM_BLOOD | M_AMPHIBIOUS, MR_RES_COLD, - 2500, 10, MONS_POLAR_BEAR, MH_NATURAL, -3, + 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, @@ -4075,7 +4281,7 @@ not think it fits into Crawl ... {dlb} MONS_BLACK_BEAR, 'U', DARKGREY, "black bear", M_WARM_BLOOD, MR_NO_FLAGS, - 1800, 10, MONS_BLACK_BEAR, MH_NATURAL, -3, + 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, @@ -4088,7 +4294,7 @@ not think it fits into Crawl ... {dlb} MONS_SIMULACRUM_SMALL, 'z', WHITE, "", M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 6, MONS_SIMULACRUM_SMALL, MH_UNDEAD, -1, + 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, @@ -4101,7 +4307,7 @@ not think it fits into Crawl ... {dlb} MONS_SIMULACRUM_LARGE, 'Z', WHITE, "", M_EVIL, MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD, - 0, 6, MONS_SIMULACRUM_LARGE, MH_UNDEAD, -1, + 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, @@ -4113,7 +4319,7 @@ not think it fits into Crawl ... {dlb} MONS_GIANT_NEWT, 'l', LIGHTGREEN, "giant newt", M_COLD_BLOOD | M_AMPHIBIOUS, MR_NO_FLAGS, - 150, 10, MONS_GIANT_NEWT, MH_NATURAL, -3, + 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, @@ -4125,7 +4331,7 @@ not think it fits into Crawl ... {dlb} MONS_GIANT_GECKO, 'l', YELLOW, "giant gecko", M_COLD_BLOOD, MR_NO_FLAGS, - 250, 10, MONS_GIANT_GECKO, MH_NATURAL, -3, + 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, @@ -4137,7 +4343,7 @@ not think it fits into Crawl ... {dlb} MONS_GIANT_IGUANA, 'l', BLUE, "giant iguana", M_COLD_BLOOD, MR_NO_FLAGS, - 400, 10, MONS_GIANT_IGUANA, MH_NATURAL, -3, + 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, @@ -4150,7 +4356,7 @@ not think it fits into Crawl ... {dlb} MONS_GILA_MONSTER, 'l', BLACK, "gila monster", M_COLD_BLOOD, MR_NO_FLAGS, - 500, 10, MONS_GILA_MONSTER, MH_NATURAL, -3, + 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, @@ -4159,10 +4365,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, MR_NO_FLAGS, - 800, 10, MONS_KOMODO_DRAGON, MH_NATURAL, -3, + 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, |