From 257cdfb81b7e73f99356ade26f527e07c786fc3b Mon Sep 17 00:00:00 2001 From: Jared Tinney (Twinge) Date: Mon, 15 Feb 2010 23:33:41 -0800 Subject: [PATCH] Monster Weight/Size/Zombie/Corpse Tweaks --- crawl-ref/source/dat/descript/monsters.txt | 6 +- crawl-ref/source/mon-data.h | 443 ++++++++++++++-------------- crawl-ref/source/rltiles/dc-corpse.txt | 5 + crawl-ref/source/tilepick.cc | 12 +- 4 files changed, 240 insertions(+), 226 deletions(-) diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt index 3a3d79d..e740de7 100644 --- a/crawl-ref/source/dat/descript/monsters.txt +++ b/crawl-ref/source/dat/descript/monsters.txt @@ -1543,6 +1543,10 @@ tormentor This malign devil is covered in all manner of claws, spines and cruel hooks. %%%% +trapdoor spider + +A sneaky arachnid that surprises its prey by hiding underneath the dungeon floor. +%%%% troll A huge, nasty-looking creature. Its thick and knobbly hide seems to heal almost instantly from most wounds. @@ -1625,7 +1629,7 @@ A large and strong grey canine. %%%% wolf spider -A large hairy spider with vicious mandibles, roaming the dungeon in search of food. +A huge hairy spider with vicious mandibles, roaming the dungeon in search of food. %%%% wood golem diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 4ba0dbe..46f0f99 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -225,43 +225,43 @@ static monsterentry mondata[] = { MONS_GIANT_ANT, 'a', RED, "giant ant", M_NO_SKELETON, MR_VUL_POISON, - 700, 10, MONS_GIANT_ANT, MONS_GIANT_ANT, MH_NATURAL, -3, + 450, 10, MONS_GIANT_ANT, MONS_GIANT_ANT, MH_NATURAL, -3, { {AT_BITE, AF_POISON, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, 4, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { MONS_QUEEN_ANT, 'a', LIGHTRED, "queen ant", M_NO_SKELETON | M_NO_FLAGS, MR_VUL_POISON, - 1200, 10, MONS_GIANT_ANT, MONS_QUEEN_ANT, MH_NATURAL, -3, + 900, 10, MONS_GIANT_ANT, MONS_QUEEN_ANT, MH_NATURAL, -3, { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 13, 3, 5, 0 }, - 14, 3, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, + 14, 3, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 7, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_SOLDIER_ANT, 'a', WHITE, "soldier ant", M_NO_SKELETON, MR_VUL_POISON, - 900, 10, MONS_GIANT_ANT, MONS_SOLDIER_ANT, MH_NATURAL, -3, + 600, 10, MONS_GIANT_ANT, MONS_SOLDIER_ANT, MH_NATURAL, -3, { {AT_STING, AF_POISON_NASTY, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 8, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_ANT_LARVA, 'a', LIGHTGREY, "ant larva", M_NO_SKELETON, MR_VUL_POISON, - 350, 5, MONS_GIANT_ANT, MONS_ANT_LARVA, MH_NATURAL, -3, + 150, 5, MONS_GIANT_ANT, MONS_ANT_LARVA, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 2, 3, 5, 0 }, 2, 6, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -286,10 +286,10 @@ static monsterentry mondata[] = { MONS_BUTTERFLY, 'b', BLACK, "butterfly", M_NO_SKELETON | M_CONFUSED | M_NO_EXP_GAIN, MR_VUL_POISON | MR_RES_ASPHYX, - 150, 10, MONS_BUTTERFLY, MONS_BUTTERFLY, MH_NATURAL, -3, + 0, 10, MONS_BUTTERFLY, MONS_BUTTERFLY, MH_NATURAL, -3, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 3, 5, 0 }, - 0, 25, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, + 0, 25, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_INSECT, HT_LAND, FL_FLY, 25, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY }, @@ -323,24 +323,24 @@ static monsterentry mondata[] = { MONS_YAKTAUR, 'c', RED, "yaktaur", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 2000, 10, MONS_YAKTAUR, MONS_YAKTAUR, MH_NATURAL, -3, + 1900, 10, MONS_YAKTAUR, MONS_YAKTAUR, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 8, 3, 5, 0 }, 4, 4, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_LARGE + MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_BIG }, { MONS_YAKTAUR_CAPTAIN, 'c', LIGHTRED, "yaktaur captain", M_WARM_BLOOD | M_FIGHTER | M_SPEAKS, MR_NO_FLAGS, - 2000, 10, MONS_YAKTAUR, MONS_YAKTAUR, MH_NATURAL, -3, + 1900, 10, MONS_YAKTAUR, MONS_YAKTAUR, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 14, 3, 5, 0 }, 5, 5, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_LARGE + MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_BIG }, // draconians ('d') @@ -800,7 +800,7 @@ static monsterentry mondata[] = { MONS_GNOLL, 'g', YELLOW, "gnoll", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 750, 10, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3, + 680, 10, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 2, 4, 5, 0 }, 2, 9, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, @@ -825,7 +825,7 @@ static monsterentry mondata[] = { MONS_JACKAL, 'h', BROWN, "jackal", M_WARM_BLOOD | M_BLOOD_SCENT, MR_NO_FLAGS, - 200, 10, MONS_HOUND, MONS_JACKAL, MH_NATURAL, -1, + 360, 10, MONS_HOUND, MONS_JACKAL, MH_NATURAL, -1, { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 3, 5, 0 }, 2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, @@ -849,11 +849,11 @@ static monsterentry mondata[] = { MONS_WARG, 'h', WHITE, "warg", M_SENSE_INVIS | M_WARM_BLOOD | M_BLOOD_SCENT, MR_RES_POISON, - 600, 12, MONS_HOUND, MONS_WARG, MH_NATURAL, -6, + 750, 12, MONS_HOUND, MONS_WARG, MH_NATURAL, -6, { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 3}, {AT_CLAW, AF_PLAIN, 3}, AT_NO_ATK }, { 4, 4, 5, 0 }, - 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, + 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BARK, I_ANIMAL, HT_LAND, FL_NONE, 13, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, @@ -868,14 +868,14 @@ static monsterentry mondata[] = { { 4, 3, 5, 0 }, 3, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BARK, I_ANIMAL, HT_LAND, FL_NONE, 17, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_WAR_DOG, 'h', CYAN, "war dog", M_SENSE_INVIS | M_WARM_BLOOD | M_BLOOD_SCENT, MR_NO_FLAGS, - 350, 19, MONS_HOUND, MONS_WAR_DOG, MH_NATURAL, -3, + 450, 19, MONS_HOUND, MONS_WAR_DOG, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, 4, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BARK, @@ -887,7 +887,7 @@ static monsterentry mondata[] = { MONS_HOG, 'h', RED, "hog", M_WARM_BLOOD, MR_NO_FLAGS, - 700, 10, MONS_HOG, MONS_HOG, MH_NATURAL, -3, + 450, 10, MONS_HOG, MONS_HOG, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 2, 9, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, @@ -924,7 +924,7 @@ static monsterentry mondata[] = { MONS_GIANT_SLUG, 'j', GREEN, "giant slug", M_NO_SKELETON, MR_NO_FLAGS, - 700, 4, MONS_GIANT_SLUG, MONS_GIANT_SLUG, MH_NATURAL, -3, + 850, 4, MONS_GIANT_SLUG, MONS_GIANT_SLUG, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 5, 3, 0 }, 0, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, @@ -936,7 +936,7 @@ static monsterentry mondata[] = { MONS_GIANT_SNAIL, 'j', LIGHTGREEN, "giant snail", M_NO_SKELETON, MR_NO_FLAGS, - 900, 2, MONS_GIANT_SLUG, MONS_GIANT_SNAIL, MH_NATURAL, -3, + 950, 2, MONS_GIANT_SLUG, MONS_GIANT_SNAIL, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 14, 5, 3, 0 }, 7, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, @@ -948,7 +948,7 @@ static monsterentry mondata[] = { MONS_ELEPHANT_SLUG, 'j', LIGHTGREY, "elephant slug", M_NO_SKELETON, MR_VUL_POISON, - 1500, 5, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3, + 1800, 5, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 20, 5, 3, 0 }, 2, 1, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, @@ -961,7 +961,7 @@ static monsterentry mondata[] = { MONS_QUEEN_BEE, 'k', YELLOW, "queen bee", M_NO_SKELETON, MR_VUL_POISON, - 200, 14, MONS_KILLER_BEE, MONS_QUEEN_BEE, MH_NATURAL, -3, + 300, 14, MONS_KILLER_BEE, MONS_QUEEN_BEE, MH_NATURAL, -3, { {AT_STING, AF_POISON_NASTY, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 10, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -985,7 +985,7 @@ static monsterentry mondata[] = { MONS_BUMBLEBEE, 'k', RED, "bumblebee", M_NO_SKELETON, MR_VUL_POISON, - 300, 10, MONS_KILLER_BEE, MONS_BUMBLEBEE, MH_NATURAL, -3, + 200, 10, MONS_KILLER_BEE, MONS_BUMBLEBEE, MH_NATURAL, -3, { {AT_STING, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 4, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_BUZZ, @@ -997,7 +997,7 @@ static monsterentry mondata[] = { MONS_KILLER_BEE_LARVA, 'k', LIGHTGREY, "killer bee larva", M_NO_SKELETON, MR_VUL_POISON, - 150, 5, MONS_KILLER_BEE, MONS_KILLER_BEE_LARVA, MH_NATURAL, -3, + 100, 5, MONS_KILLER_BEE, MONS_KILLER_BEE_LARVA, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 3, 5, 0 }, 1, 5, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -1010,7 +1010,7 @@ static monsterentry mondata[] = { MONS_GIANT_NEWT, 'l', GREEN, "giant newt", M_COLD_BLOOD, MR_NO_FLAGS, - 150, 10, MONS_GIANT_NEWT, MONS_GIANT_NEWT, MH_NATURAL, -3, + 170, 10, MONS_GIANT_NEWT, MONS_GIANT_NEWT, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 1, 2, 0 }, 0, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, @@ -1027,7 +1027,7 @@ static monsterentry mondata[] = { { 1, 3, 5, 0 }, 1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { @@ -1039,7 +1039,7 @@ static monsterentry mondata[] = { { 3, 3, 5, 0 }, 5, 9, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, I_INSECT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { @@ -1047,12 +1047,12 @@ static monsterentry mondata[] = { MONS_GILA_MONSTER, 'l', MAGENTA, "gila monster", M_COLD_BLOOD, MR_NO_FLAGS, - 500, 10, MONS_GIANT_NEWT, MONS_GILA_MONSTER, MH_NATURAL, -3, + 450, 10, MONS_GIANT_NEWT, MONS_GILA_MONSTER, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 4, 4, 0 }, - 3, 12, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_HISS, + 3, 12, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { @@ -1064,7 +1064,7 @@ static monsterentry mondata[] = { { 8, 3, 5, 0 }, 7, 8, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_HISS, I_INSECT, HT_AMPHIBIOUS, FL_NONE, 10, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, // drakes (also 'l', but dragon type) @@ -1077,37 +1077,32 @@ static monsterentry mondata[] = { { 4, 5, 5, 0 }, 3, 11, MST_SWAMP_DRAKE, CE_POISONOUS, Z_BIG, S_ROAR, I_ANIMAL, HT_LAND, FL_FLY, 11, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_FIRE_DRAKE, 'l', RED, "fire drake", M_SPECIAL_ABILITY | M_WARM_BLOOD, MR_RES_FIRE, - 900, 10, MONS_DRAGON, MONS_FIRE_DRAKE, MH_NATURAL, -3, + 1000, 10, MONS_DRAGON, MONS_FIRE_DRAKE, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_ANIMAL, HT_LAND, FL_FLY, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, -// Used to be "lindworm" and a GREEN 'l'... I'm hoping that by making -// it a 'd' and using an alternate spelling, people will more -// intuitively know that this isn't a regular lizard. - bwr -// Changed back to 'l' for differentiation, as the 'd' glyph is packed -// with draconians already, and a lightcyan l is unique. - jpeg, Feb 08 { MONS_LINDWURM, 'l', LIGHTCYAN, "lindwurm", M_SPECIAL_ABILITY | M_WARM_BLOOD, MR_NO_FLAGS, - 1000, 13, MONS_DRAGON, MONS_LINDWURM, MH_NATURAL, -3, + 950, 13, MONS_DRAGON, MONS_LINDWURM, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK }, { 9, 3, 5, 0 }, 8, 6, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_ROAR, I_INSECT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { @@ -1119,7 +1114,7 @@ static monsterentry mondata[] = { { 9, 5, 7, 0 }, 6, 14, MST_DEATH_DRAKE, CE_HCL, Z_BIG, S_ROAR, I_ANIMAL, HT_LAND, FL_FLY, 13, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, // merfolk ('m') @@ -1143,7 +1138,7 @@ static monsterentry mondata[] = { { {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 5, 4, 0 }, // Impalers prefer light armour, and are dodging experts. - 0, 18, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 0, 18, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS, FL_NONE, 10, ATTACK_ENERGY(6) | SWIM_ENERGY(6), MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -1155,7 +1150,7 @@ static monsterentry mondata[] = { 500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, { {AT_SHOOT, AF_PLAIN, 16}, {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK }, { 13, 5, 2, 0 }, - 0, 14, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 0, 14, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS, FL_NONE, 10, SWIM_ENERGY(6), MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -1167,7 +1162,7 @@ static monsterentry mondata[] = { 500, 8, MONS_MERFOLK, MONS_MERFOLK, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 15, 3, 3, 0 }, - 0, 12, MST_MERFOLK_AQUAMANCER, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 0, 12, MST_MERFOLK_AQUAMANCER, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS, FL_NONE, 10, SWIM_ENERGY(6), MONUSE_MAGIC_ITEMS, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -1191,7 +1186,7 @@ static monsterentry mondata[] = { 500, 10, MONS_MERMAID, MONS_SIREN, MH_NATURAL, -7, { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 13, 5, 3, 0 }, - 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 4, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, HT_AMPHIBIOUS, FL_NONE, 10, SWIM_ENERGY(6), MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -1225,10 +1220,10 @@ static monsterentry mondata[] = { MONS_ROTTING_HULK, 'n', BROWN, "rotting hulk", M_NO_FLAGS, MR_RES_POISON | MR_RES_COLD, - 0, 10, MONS_GHOUL, MONS_ROTTING_HULK, MH_UNDEAD, -5, + 780, 10, MONS_GHOUL, MONS_ROTTING_HULK, MH_UNDEAD, -5, { {AT_HIT, AF_DISEASE, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 5, 0 }, - 5, 7, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, + 5, 7, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT, I_NORMAL, HT_LAND, FL_NONE, 8, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE }, @@ -1432,14 +1427,14 @@ static monsterentry mondata[] = { { 1, 3, 5, 0 }, 2, 13, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_GREY_RAT, 'r', LIGHTGREY, "grey rat", M_WARM_BLOOD, MR_NO_FLAGS, - 250, 26, MONS_RAT, MONS_GREY_RAT, MH_NATURAL, -3, + 220, 26, MONS_RAT, MONS_GREY_RAT, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 3, 6, 0 }, 2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, @@ -1451,7 +1446,7 @@ static monsterentry mondata[] = { MONS_GREEN_RAT, 'r', LIGHTGREEN, "green rat", M_WARM_BLOOD, MR_NO_FLAGS, - 250, 13, MONS_RAT, MONS_GREEN_RAT, MH_NATURAL, -3, + 220, 13, MONS_RAT, MONS_GREEN_RAT, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 2, 3, 5, 0 }, 5, 11, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -1463,7 +1458,7 @@ static monsterentry mondata[] = { MONS_ORANGE_RAT, 'r', LIGHTRED, "orange rat", M_WARM_BLOOD | M_GLOWS, MR_NO_FLAGS, - 250, 10, MONS_RAT, MONS_ORANGE_RAT, MH_NATURAL, -3, + 300, 10, MONS_RAT, MONS_ORANGE_RAT, MH_NATURAL, -3, { {AT_BITE, AF_DRAIN_XP, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, 7, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_ROAR, @@ -1481,74 +1476,74 @@ static monsterentry mondata[] = { { 1, 3, 4, 0 }, 3, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_GIANT_MITE, 's', LIGHTRED, "giant mite", M_NO_SKELETON, MR_VUL_POISON, - 350, 10, MONS_GIANT_MITE, MONS_GIANT_MITE, MH_NATURAL, -1, + 300, 10, MONS_GIANT_MITE, MONS_GIANT_MITE, MH_NATURAL, -1, { {AT_BITE, AF_POISON, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 2, 3, 5, 0 }, 1, 7, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_GIANT_CENTIPEDE, 's', GREEN, "giant centipede", M_NO_SKELETON, MR_VUL_POISON, - 350, 10, MONS_GIANT_CENTIPEDE, MONS_GIANT_CENTIPEDE, MH_NATURAL, -3, + 250, 10, MONS_GIANT_CENTIPEDE, MONS_GIANT_CENTIPEDE, MH_NATURAL, -3, { {AT_STING, AF_POISON_NASTY, 2}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 2, 3, 3, 0 }, 2, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 13, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_SCORPION, 's', YELLOW, "scorpion", M_NO_SKELETON, MR_VUL_POISON, - 500, 13, MONS_SCORPION, MONS_SCORPION, MH_NATURAL, -3, + 320, 13, MONS_SCORPION, MONS_SCORPION, MH_NATURAL, -3, { {AT_STING, AF_POISON_MEDIUM, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, 5, 10, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { MONS_WOLF_SPIDER, 's', WHITE, "wolf spider", M_NO_SKELETON, MR_VUL_POISON, - 800, 10, MONS_WOLF_SPIDER, MONS_WOLF_SPIDER, MH_NATURAL, -3, + 900, 10, MONS_WOLF_SPIDER, MONS_WOLF_SPIDER, MH_NATURAL, -3, { {AT_BITE, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 8, 3, 5, 0 }, 3, 10, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_HISS, I_INSECT, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_TRAPDOOR_SPIDER, 's', LIGHTCYAN, "trapdoor spider", M_NO_SKELETON | M_SUBMERGES, MR_VUL_POISON, - 800, 10, MONS_TRAPDOOR_SPIDER, MONS_TRAPDOOR_SPIDER, MH_NATURAL, -3, + 240, 10, MONS_TRAPDOOR_SPIDER, MONS_TRAPDOOR_SPIDER, MH_NATURAL, -3, { {AT_BITE, AF_POISON_MEDIUM, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 8, 3, 5, 0 }, - 3, 10, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_HISS, + 3, 10, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_HISS, //XXX: Will be Z_SMALL, but is Z_NOZOMBIE until code for zombie spawns is no longer based on zombie size. I_INSECT, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_REDBACK, 's', RED, "redback", M_NO_SKELETON, MR_VUL_POISON, - 1000, 14, MONS_WOLF_SPIDER, MONS_REDBACK, MH_NATURAL, -3, + 130, 14, MONS_WOLF_SPIDER, MONS_REDBACK, MH_NATURAL, -3, { {AT_BITE, AF_POISON_STRONG, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 2, 12, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -1561,19 +1556,19 @@ static monsterentry mondata[] = { MONS_CROCODILE, 't', BROWN, "crocodile", M_COLD_BLOOD | M_SUBMERGES, MR_NO_FLAGS, - 600, 10, MONS_CROCODILE, MONS_CROCODILE, MH_NATURAL, -3, + 800, 10, MONS_CROCODILE, MONS_CROCODILE, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 5, 0 }, 4, 10, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT, I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 10, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_BABY_ALLIGATOR, 't', BLUE, "baby alligator", M_COLD_BLOOD | M_SPELLCASTER | M_SUBMERGES, MR_NO_FLAGS, - 250, 10, MONS_CROCODILE, MONS_BABY_ALLIGATOR, MH_NATURAL, -3, + 300, 10, MONS_CROCODILE, MONS_BABY_ALLIGATOR, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 1, 11, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, @@ -1585,7 +1580,7 @@ static monsterentry mondata[] = { MONS_ALLIGATOR, 't', LIGHTBLUE, "alligator", M_COLD_BLOOD | M_SPELLCASTER | M_SUBMERGES, MR_NO_FLAGS, - 600, 10, MONS_CROCODILE, MONS_ALLIGATOR, MH_NATURAL, -3, + 850, 10, MONS_CROCODILE, MONS_ALLIGATOR, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 30}, { AT_TAIL_SLAP, AF_PLAIN, 15 }, AT_NO_ATK, AT_NO_ATK }, { 12, 3, 6, 0 }, 5, 9, MST_ALLIGATOR, CE_CLEAN, Z_BIG, S_SILENT, @@ -1597,23 +1592,23 @@ static monsterentry mondata[] = { MONS_SNAPPING_TURTLE, 't', GREEN, "snapping turtle", M_COLD_BLOOD, MR_NO_FLAGS, - 500, 10, MONS_SNAPPING_TURTLE, MONS_SNAPPING_TURTLE, MH_NATURAL, -3, + 600, 10, MONS_SNAPPING_TURTLE, MONS_SNAPPING_TURTLE, MH_NATURAL, -3, { {AT_BITE, AF_REACH, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 6, 0 }, - 16, 5, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, + 16, 5, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_HISS, //XXX: Will be Z_SMALL, but is Z_BIG until code for zombie spawns is no longer based on zombie size. I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 9, ACTION_ENERGY(8) | SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_ALLIGATOR_SNAPPING_TURTLE, 't', LIGHTGREEN, "alligator snapping turtle", M_COLD_BLOOD, MR_NO_FLAGS, - 1000, 10, MONS_SNAPPING_TURTLE, MONS_ALLIGATOR_SNAPPING_TURTLE, + 1100, 10, MONS_SNAPPING_TURTLE, MONS_ALLIGATOR_SNAPPING_TURTLE, MH_NATURAL, -3, { {AT_BITE, AF_REACH, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 7, 4, 0 }, - 19, 1, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, + 19, 1, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_HISS, I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 8, SWIM_ENERGY(6), MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, @@ -1635,7 +1630,7 @@ static monsterentry mondata[] = { MONS_VERY_UGLY_THING, 'u', BLACK, "very ugly thing", M_WARM_BLOOD | M_GLOWS, MR_NO_FLAGS, - 750, 10, MONS_UGLY_THING, MONS_VERY_UGLY_THING, MH_NATURAL, -3, + 830, 10, MONS_UGLY_THING, MONS_VERY_UGLY_THING, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 3, 5, 0 }, 4, 10, MST_NO_SPELLS, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_GURGLE, @@ -1698,19 +1693,19 @@ static monsterentry mondata[] = { MONS_WORM, 'w', LIGHTRED, "worm", M_NO_SKELETON, MR_NO_FLAGS, - 350, 3, MONS_WORM, MONS_WORM, MH_NATURAL, -2, + 400, 3, MONS_WORM, MONS_WORM, MH_NATURAL, -2, { {AT_BITE, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 5, 0 }, 1, 5, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_PLANT, HT_LAND, FL_NONE, 6, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { MONS_BRAIN_WORM, 'w', LIGHTMAGENTA, "brain worm", M_NO_SKELETON | M_SPELLCASTER, MR_NO_FLAGS, - 150, 10, MONS_WORM, MONS_BRAIN_WORM, MH_NATURAL, -3, + 280, 10, MONS_WORM, MONS_BRAIN_WORM, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 3, 0 }, 1, 5, MST_BRAIN_WORM, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -1722,22 +1717,22 @@ static monsterentry mondata[] = { MONS_SWAMP_WORM, 'w', BROWN, "swamp worm", M_NO_SKELETON | M_SUBMERGES, MR_NO_FLAGS, - 350, 10, MONS_WORM, MONS_SWAMP_WORM, MH_NATURAL, -3, + 450, 10, MONS_WORM, MONS_SWAMP_WORM, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 5, 5, 0 }, 3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, I_PLANT, HT_WATER, FL_NONE, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_SPINY_WORM, 'w', LIGHTGREEN, "spiny worm", M_NO_SKELETON, MR_VUL_POISON | MR_RES_ACID, - 1300, 13, MONS_WORM, MONS_SPINY_WORM, MH_NATURAL, -3, + 1650, 13, MONS_WORM, MONS_SPINY_WORM, MH_NATURAL, -3, { {AT_STING, AF_ACID, 32}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 3, 5, 0 }, - 10, 6, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, + 10, 6, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_PLANT, HT_LAND, FL_NONE, 9, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG }, @@ -1746,12 +1741,12 @@ static monsterentry mondata[] = { MONS_GIANT_LEECH, 'w', RED, "giant leech", M_NO_SKELETON | M_BLOOD_SCENT, MR_NO_FLAGS, - 1100, 10, MONS_WORM, MONS_GIANT_LEECH, MH_NATURAL, -3, + 1000, 10, MONS_WORM, MONS_GIANT_LEECH, MH_NATURAL, -3, { {AT_BITE, AF_VAMPIRIC, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 5, 5, 0 }, - 5, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT, + 5, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_PLANT, HT_AMPHIBIOUS, FL_NONE, 8, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, // small abominations ('x') @@ -1784,7 +1779,7 @@ static monsterentry mondata[] = { MONS_YELLOW_WASP, 'y', YELLOW, "yellow wasp", M_NO_SKELETON, MR_VUL_POISON, - 220, 15, MONS_YELLOW_WASP, MONS_YELLOW_WASP, MH_NATURAL, -3, + 170, 15, MONS_YELLOW_WASP, MONS_YELLOW_WASP, MH_NATURAL, -3, { {AT_STING, AF_PARALYSE, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, 5, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, @@ -1796,7 +1791,7 @@ static monsterentry mondata[] = { MONS_GIANT_MOSQUITO, 'y', WHITE, "giant mosquito", M_NO_SKELETON | M_BLOOD_SCENT, MR_VUL_POISON, - 100, 48, MONS_GIANT_MOSQUITO, MONS_GIANT_MOSQUITO, MH_NATURAL, -3, + 50, 48, MONS_GIANT_MOSQUITO, MONS_GIANT_MOSQUITO, MH_NATURAL, -3, { {AT_BITE, AF_DISEASE, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 3, 5, 0 }, 0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_WHINE, @@ -1813,14 +1808,14 @@ static monsterentry mondata[] = { { 5, 3, 5, 0 }, 2, 15, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_BUZZ, I_PLANT, HT_LAND, FL_FLY, 19, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_RED_WASP, 'y', RED, "red wasp", M_NO_SKELETON, MR_VUL_POISON, - 400, 12, MONS_YELLOW_WASP, MONS_RED_WASP, MH_NATURAL, -3, + 180, 12, MONS_YELLOW_WASP, MONS_RED_WASP, MH_NATURAL, -3, { {AT_STING, AF_PARALYSE, 23}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 8, 3, 5, 0 }, 7, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_BUZZ, @@ -1830,14 +1825,14 @@ static monsterentry mondata[] = { { MONS_MOTH_OF_WRATH, 'y', BROWN, "moth of wrath", - M_SPECIAL_ABILITY, + M_NO_SKELETON | M_SPECIAL_ABILITY, MR_NO_FLAGS, - 0, 10, MONS_MOTH_OF_WRATH, MONS_MOTH_OF_WRATH, MH_NATURAL, -3, + 300, 10, MONS_MOTH_OF_WRATH, MONS_MOTH_OF_WRATH, MH_NATURAL, -3, { {AT_BITE, AF_RAGE, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 9, 3, 5, 0 }, - 0, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, + 0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, //XXX: Will be Z_SMALL, but is Z_NOZOMBIE until code for zombie spawns is no longer based on zombie size. I_HIGH, HT_LAND, FL_FLY, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, // small zombies etc. ('z') @@ -1974,10 +1969,10 @@ static monsterentry mondata[] = { MONS_GIANT_BEETLE, 'B', BLUE, "giant beetle", M_NO_SKELETON, MR_VUL_POISON, - 1000, 12, MONS_GIANT_BEETLE, MONS_GIANT_BEETLE, MH_NATURAL, -3, + 800, 12, MONS_GIANT_BEETLE, MONS_GIANT_BEETLE, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 7, 6, 0 }, - 10, 3, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, + 10, 3, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 5, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -1986,12 +1981,12 @@ static monsterentry mondata[] = { MONS_BOULDER_BEETLE, 'B', LIGHTGREY, "boulder beetle", M_NO_SKELETON, MR_VUL_POISON, - 2500, 8, MONS_GIANT_BEETLE, MONS_BOULDER_BEETLE, MH_NATURAL, -3, + 2050, 8, MONS_GIANT_BEETLE, MONS_BOULDER_BEETLE, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 45}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 9, 3, 5, 0 }, 20, 2, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SILENT, I_INSECT, HT_LAND, FL_NONE, 3, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG }, { @@ -2011,7 +2006,7 @@ static monsterentry mondata[] = { MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 1600, 7, MONS_HILL_GIANT, MONS_HILL_GIANT, MH_NATURAL, -3, + 1700, 7, MONS_HILL_GIANT, MONS_HILL_GIANT, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 11, 3, 5, 0 }, 3, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, @@ -2023,7 +2018,7 @@ static monsterentry mondata[] = { MONS_ETTIN, 'C', BROWN, "ettin", M_WARM_BLOOD | M_TWOWEAPON | M_SPEAKS, MR_NO_FLAGS, - 2000, 10, MONS_HILL_GIANT, MONS_ETTIN, MH_NATURAL, -3, + 1820, 10, MONS_HILL_GIANT, MONS_ETTIN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 18}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 3, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT2, @@ -2035,7 +2030,7 @@ static monsterentry mondata[] = { MONS_CYCLOPS, 'C', YELLOW, "cyclops", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 2500, 14, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3, + 2200, 14, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 9, 3, 5, 0 }, 5, 3, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SHOUT, @@ -2047,7 +2042,7 @@ static monsterentry mondata[] = { MONS_FIRE_GIANT, 'C', RED, "fire giant", M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_SPEAKS, mrd(MR_RES_FIRE, 2), - 2400, 11, MONS_HILL_GIANT, MONS_FIRE_GIANT, MH_NATURAL, -4, + 2000, 11, MONS_HILL_GIANT, MONS_FIRE_GIANT, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 3, 6, 0 }, 8, 4, MST_EFREET, CE_CONTAMINATED, Z_BIG, S_SHOUT, @@ -2059,7 +2054,7 @@ static monsterentry mondata[] = { MONS_FROST_GIANT, 'C', LIGHTBLUE, "frost giant", M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_SPEAKS, mrd(MR_RES_COLD, 2), - 2600, 11, MONS_HILL_GIANT, MONS_FROST_GIANT, MH_NATURAL, -4, + 2100, 11, MONS_HILL_GIANT, MONS_FROST_GIANT, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 35}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 4, 5, 0 }, 9, 3, MST_FROST_GIANT, CE_CONTAMINATED, Z_BIG, S_SHOUT, @@ -2071,24 +2066,24 @@ static monsterentry mondata[] = { MONS_STONE_GIANT, 'C', LIGHTGREY, "stone giant", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 3000, 10, MONS_HILL_GIANT, MONS_STONE_GIANT, MH_NATURAL, -4, + 2700, 10, MONS_HILL_GIANT, MONS_STONE_GIANT, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 45}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 3, 5, 0 }, 12, 2, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT, I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_GIANT + MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_HUGE }, { MONS_TITAN, 'C', MAGENTA, "titan", M_FIGHTER | M_SPELLCASTER | M_WARM_BLOOD | M_SENSE_INVIS | M_SPEAKS, mrd(MR_RES_ELEC, 2), - 3500, 12, MONS_HILL_GIANT, MONS_TITAN, MH_NATURAL, -7, + 3200, 12, MONS_HILL_GIANT, MONS_TITAN, MH_NATURAL, -7, { {AT_HIT, AF_PLAIN, 55}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 20, 3, 5, 0 }, 10, 3, MST_TITAN, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_GIANT + MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_HUGE }, // dragons ('D') @@ -2096,19 +2091,19 @@ static monsterentry mondata[] = { MONS_WYVERN, 'D', LIGHTRED, "wyvern", M_WARM_BLOOD, MR_NO_FLAGS, - 2000, 15, MONS_WYVERN, MONS_WYVERN, MH_NATURAL, -3, + 1200, 15, MONS_WYVERN, MONS_WYVERN, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 5, 0 }, - 5, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, + 5, 10, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SILENT, I_ANIMAL, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_DRAGON, 'D', GREEN, "dragon", M_SPECIAL_ABILITY | M_WARM_BLOOD, MR_RES_POISON | mrd(MR_RES_FIRE, 2) | MR_VUL_COLD, - 2200, 12, MONS_DRAGON, MONS_DRAGON, MH_NATURAL, -4, + 2400, 12, MONS_DRAGON, MONS_DRAGON, MH_NATURAL, -4, { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 13}, {AT_CLAW, AF_PLAIN, 13}, AT_NO_ATK }, { 12, 5, 5, 0 }, @@ -2133,7 +2128,7 @@ static monsterentry mondata[] = { MONS_ICE_DRAGON, 'D', WHITE, "ice dragon", M_SPECIAL_ABILITY | M_COLD_BLOOD, MR_RES_POISON | MR_VUL_FIRE | mrd(MR_RES_COLD, 2), - 2200, 10, MONS_DRAGON, MONS_ICE_DRAGON, MH_NATURAL, -3, + 2400, 10, MONS_DRAGON, MONS_ICE_DRAGON, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 17}, {AT_CLAW, AF_PLAIN, 17}, {AT_CLAW, AF_PLAIN, 17}, AT_NO_ATK }, { 12, 5, 5, 0 }, @@ -2146,44 +2141,44 @@ static monsterentry mondata[] = { MONS_STEAM_DRAGON, 'D', BLUE, "steam dragon", M_SPELLCASTER | M_WARM_BLOOD, MR_RES_STEAM, - 1000, 29, MONS_DRAGON, MONS_STEAM_DRAGON, MH_NATURAL, -3, + 1500, 29, MONS_DRAGON, MONS_STEAM_DRAGON, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK }, { 4, 5, 5, 0 }, 5, 10, MST_STEAM_DRAGON, CE_CLEAN, Z_BIG, S_SILENT, I_ANIMAL, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG }, { MONS_SWAMP_DRAGON, 'D', BROWN, "swamp dragon", M_SPELLCASTER | M_WARM_BLOOD, MR_RES_POISON, - 1900, 11, MONS_DRAGON, MONS_SWAMP_DRAGON, MH_NATURAL, -3, + 2200, 11, MONS_DRAGON, MONS_SWAMP_DRAGON, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 18}, {AT_CLAW, AF_PLAIN, 9}, {AT_CLAW, AF_PLAIN, 9}, AT_NO_ATK }, { 9, 5, 5, 0 }, 7, 7, MST_SWAMP_DRAGON, CE_POISONOUS, Z_BIG, S_ROAR, I_ANIMAL, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE }, { MONS_MOTTLED_DRAGON, 'D', LIGHTMAGENTA, "mottled dragon", M_SPELLCASTER | M_WARM_BLOOD, MR_RES_POISON | MR_RES_FIRE | MR_RES_STICKY_FLAME, - 1100, 16, MONS_DRAGON, MONS_MOTTLED_DRAGON, MH_NATURAL, -3, + 1300, 16, MONS_DRAGON, MONS_MOTTLED_DRAGON, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 5, 0 }, 5, 10, MST_MOTTLED_DRAGON, CE_POISONOUS, Z_BIG, S_SILENT, I_ANIMAL, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG }, { MONS_QUICKSILVER_DRAGON, 'D', LIGHTCYAN, "quicksilver dragon", M_SPELLCASTER | M_SENSE_INVIS | M_WARM_BLOOD, MR_NO_FLAGS, - 2200, 14, MONS_DRAGON, MONS_QUICKSILVER_DRAGON, MH_NATURAL, -7, + 1900, 14, MONS_DRAGON, MONS_QUICKSILVER_DRAGON, MH_NATURAL, -7, { {AT_BITE, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK }, { 16, 3, 5, 0 }, 10, 15, MST_QUICKSILVER_DRAGON, CE_CONTAMINATED, Z_BIG, S_ROAR, @@ -2195,7 +2190,7 @@ static monsterentry mondata[] = { MONS_IRON_DRAGON, 'D', CYAN, "iron dragon", M_SPELLCASTER | M_SENSE_INVIS | M_WARM_BLOOD, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, - 2400, 14, MONS_DRAGON, MONS_IRON_DRAGON, MH_NATURAL, -7, + 2800, 14, MONS_DRAGON, MONS_IRON_DRAGON, MH_NATURAL, -7, { {AT_BITE, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 25}, AT_NO_ATK }, { 18, 5, 3, 0 }, @@ -2208,7 +2203,7 @@ static monsterentry mondata[] = { MONS_STORM_DRAGON, 'D', LIGHTBLUE, "storm dragon", M_SPELLCASTER | M_WARM_BLOOD, mrd(MR_RES_ELEC, 3) | MR_RES_COLD, - 2800, 12, MONS_DRAGON, MONS_STORM_DRAGON, MH_NATURAL, -5, + 2700, 12, MONS_DRAGON, MONS_STORM_DRAGON, MH_NATURAL, -5, { {AT_BITE, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK }, { 14, 5, 5, 0 }, @@ -2234,13 +2229,13 @@ static monsterentry mondata[] = { MONS_SHADOW_DRAGON, 'D', MAGENTA, "shadow dragon", M_SPELLCASTER | M_SEE_INVIS | M_COLD_BLOOD, MR_RES_POISON | mrd(MR_RES_COLD, 2), - 2000, 12, MONS_DRAGON, MONS_SHADOW_DRAGON, MH_NATURAL, -5, + 1800, 12, MONS_DRAGON, MONS_SHADOW_DRAGON, MH_NATURAL, -5, { {AT_BITE, AF_DRAIN_XP, 20}, {AT_CLAW, AF_PLAIN, 15}, {AT_CLAW, AF_PLAIN, 15}, AT_NO_ATK }, { 17, 5, 5, 0 }, 15, 10, MST_SHADOW_DRAGON, CE_HCL, Z_BIG, S_ROAR, I_ANIMAL, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT }, { @@ -2323,48 +2318,48 @@ static monsterentry mondata[] = { MONS_GIANT_FROG, 'F', GREEN, "giant frog", M_COLD_BLOOD, MR_NO_FLAGS, - 500, 10, MONS_GIANT_FROG, MONS_GIANT_FROG, MH_NATURAL, -3, + 600, 10, MONS_GIANT_FROG, MONS_GIANT_FROG, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, - 0, 12, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_CROAK, + 0, 12, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_CROAK, //XXX: Will be Z_SMALL, but is Z_BIG until code for zombie spawns is no longer based on zombie size I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 15, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_GIANT_TOAD, 'F', BROWN, "giant toad", M_COLD_BLOOD, MR_NO_FLAGS, - 890, 6, MONS_GIANT_FROG, MONS_GIANT_TOAD, MH_NATURAL, -3, + 900, 6, MONS_GIANT_FROG, MONS_GIANT_TOAD, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 14}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 8, 3, 5, 0 }, 2, 11, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_CROAK, I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 13, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_SPINY_FROG, 'F', YELLOW, "spiny frog", M_COLD_BLOOD, MR_RES_POISON, - 1000, 16, MONS_GIANT_FROG, MONS_SPINY_FROG, MH_NATURAL, -3, + 700, 16, MONS_GIANT_FROG, MONS_SPINY_FROG, MH_NATURAL, -3, { {AT_STING, AF_POISON_MEDIUM, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, - 6, 9, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_CROAK, + 6, 9, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_CROAK, //XXX: Will be Z_SMALL, but is Z_BIG until code for zombie spawns is no longer based on zombie size I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 12, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_BLINK_FROG, 'F', LIGHTGREEN, "blink frog", M_COLD_BLOOD | M_SPECIAL_ABILITY, MR_NO_FLAGS, - 800, 13, MONS_BLINK_FROG, MONS_BLINK_FROG, MH_NATURAL, -5, + 450, 13, MONS_BLINK_FROG, MONS_BLINK_FROG, MH_NATURAL, -5, { {AT_HIT, AF_BLINK, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 3, 12, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_CROAK, I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 14, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, // eyes ('G') @@ -2396,19 +2391,19 @@ static monsterentry mondata[] = { MONS_GIANT_ORANGE_BRAIN, 'G', LIGHTRED, "giant orange brain", M_NO_SKELETON | M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD, MR_RES_ASPHYX, - 1000, 13, MONS_GIANT_ORANGE_BRAIN, MONS_GIANT_ORANGE_BRAIN, MH_NATURAL, -8, + 500, 13, MONS_GIANT_ORANGE_BRAIN, MONS_GIANT_ORANGE_BRAIN, MH_NATURAL, -8, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 5, 0 }, 2, 4, MST_GIANT_ORANGE_BRAIN, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, I_HIGH, HT_LAND, FL_LEVITATE, 10, DEFAULT_ENERGY, - MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_SMALL + MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_GREAT_ORB_OF_EYES, 'G', LIGHTGREEN, "great orb of eyes", M_NO_SKELETON | M_SPELLCASTER | M_SEE_INVIS, MR_RES_POISON, - 900, 13, MONS_GIANT_EYEBALL, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, MAG_IMMUNE, + 700, 13, MONS_GIANT_EYEBALL, MONS_GREAT_ORB_OF_EYES, MH_NATURAL, MAG_IMMUNE, { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 3, 5, 0 }, 10, 3, MST_GREAT_ORB_OF_EYES, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, @@ -2420,7 +2415,7 @@ static monsterentry mondata[] = { MONS_SHINING_EYE, 'G', LIGHTMAGENTA, "shining eye", M_SPELLCASTER | M_SEE_INVIS | M_GLOWS, MR_RES_ASPHYX, - 0, 14, MONS_GIANT_EYEBALL, MONS_SHINING_EYE, MH_NATURAL, MAG_IMMUNE, + 450, 14, MONS_GIANT_EYEBALL, MONS_SHINING_EYE, MH_NATURAL, MAG_IMMUNE, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 5, 0 }, 3, 1, MST_SHINING_EYE, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SILENT, @@ -2432,12 +2427,12 @@ static monsterentry mondata[] = { MONS_EYE_OF_DEVASTATION, 'G', YELLOW, "eye of devastation", M_SPELLCASTER | M_SEE_INVIS | M_GLOWS, MR_RES_ASPHYX, - 0, 11, MONS_GIANT_EYEBALL, MONS_EYE_OF_DEVASTATION, MH_NATURAL, MAG_IMMUNE, + 450, 11, MONS_GIANT_EYEBALL, MONS_EYE_OF_DEVASTATION, MH_NATURAL, MAG_IMMUNE, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 5, 0 }, - 12, 1, MST_EYE_OF_DEVASTATION, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, + 12, 1, MST_EYE_OF_DEVASTATION, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_LAND, FL_LEVITATE, 7, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { @@ -2457,36 +2452,36 @@ static monsterentry mondata[] = { MONS_HIPPOGRIFF, 'H', BROWN, "hippogriff", M_WARM_BLOOD, MR_NO_FLAGS, - 1000, 8, MONS_HIPPOGRIFF, MONS_HIPPOGRIFF, MH_NATURAL, -3, + 1150, 8, MONS_HIPPOGRIFF, MONS_HIPPOGRIFF, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 10}, {AT_PECK, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK }, { 7, 3, 5, 0 }, 2, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_SCREECH, I_ANIMAL, HT_LAND, FL_FLY, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_MANTICORE, 'H', RED, "manticore", M_WARM_BLOOD | M_SPECIAL_ABILITY, MR_NO_FLAGS, - 1800, 10, MONS_MANTICORE, MONS_MANTICORE, MH_NATURAL, -3, + 1200, 10, MONS_MANTICORE, MONS_MANTICORE, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 14}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK }, { 9, 3, 5, 0 }, 5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_NORMAL, HT_LAND, FL_NONE, 7, DEFAULT_ENERGY, - MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_BIG + MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE }, { MONS_MINOTAUR, 'H', LIGHTRED, "minotaur", M_FIGHTER | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 1500, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3, + 900, 10, MONS_MINOTAUR, MONS_MINOTAUR, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 35}, {AT_GORE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK }, { 13, 3, 5, 0 }, - 5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW, + 5, 7, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_BELLOW, //XXX: Will be Z_SMALL, but is Z_BIG until code for zombie spawns is no longer based on zombie size. I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -2495,7 +2490,7 @@ static monsterentry mondata[] = { MONS_GRIFFON, 'H', YELLOW, "griffon", M_WARM_BLOOD, MR_NO_FLAGS, - 1800, 8, MONS_GRIFFON, MONS_GRIFFON, MH_NATURAL, -3, + 1700, 8, MONS_GRIFFON, MONS_GRIFFON, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 18}, {AT_PECK, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK }, { 12, 3, 5, 0 }, @@ -2508,11 +2503,11 @@ static monsterentry mondata[] = { MONS_SPHINX, 'H', LIGHTGREY, "sphinx", M_SENSE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 0, 10, MONS_SPHINX, MONS_SPHINX, MH_NATURAL, -3, + 1800, 10, MONS_SPHINX, MONS_SPHINX, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 25}, {AT_HIT, AF_PLAIN, 12}, {AT_HIT, AF_PLAIN, 12}, AT_NO_ATK }, { 16, 3, 5, 0 }, - 5, 5, MST_SPHINX, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, + 5, 5, MST_SPHINX, CE_CLEAN, Z_BIG, S_SHOUT, I_HIGH, HT_LAND, FL_FLY, 13, DEFAULT_ENERGY, MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_BIG }, @@ -2521,11 +2516,11 @@ static monsterentry mondata[] = { MONS_HARPY, 'H', GREEN, "harpy", M_WARM_BLOOD | M_BATTY, MR_RES_POISON, - 1000, 9, MONS_HARPY, MONS_HARPY, MH_NATURAL, -3, + 480, 9, MONS_HARPY, MONS_HARPY, MH_NATURAL, -3, { {AT_CLAW, AF_PLAIN, 19}, {AT_CLAW, AF_STEAL_FOOD, 14}, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, - 2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SCREECH, + 2, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SCREECH, //XXX: Will be Z_SMALL, but is Z_BIG until code for zombie spawns is no longer based on zombie size. I_NORMAL, HT_LAND, FL_FLY, 25, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_FOOD, SIZE_MEDIUM }, @@ -2565,7 +2560,7 @@ static monsterentry mondata[] = { { 3, 5, 5, 0 }, 0, 2, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_AMPHIBIOUS, FL_NONE, 9, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_ITEMS, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_ITEMS, SIZE_SMALL }, { @@ -2589,7 +2584,7 @@ static monsterentry mondata[] = { { 11, 3, 5, 0 }, 1, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_AMPHIBIOUS, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { @@ -2601,19 +2596,19 @@ static monsterentry mondata[] = { { 10, 3, 5, 0 }, 2, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_LAND, FL_NONE, 5, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { MONS_GIANT_AMOEBA, 'J', BLUE, "giant amoeba", M_NO_SKELETON | M_SENSE_INVIS, MR_RES_POISON | MR_RES_ASPHYX, - 1000, 7, MONS_JELLY, MONS_GIANT_AMOEBA, MH_NATURAL, -3, + 700, 7, MONS_JELLY, MONS_GIANT_AMOEBA, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 3, 5, 0 }, 0, 4, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_AMPHIBIOUS, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { @@ -2639,7 +2634,7 @@ static monsterentry mondata[] = { { 15, 3, 5, 0 }, 5, 10, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_LAND, FL_NONE, 12, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_ITEMS, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_ITEMS, SIZE_SMALL }, { @@ -2663,7 +2658,7 @@ static monsterentry mondata[] = { { 18, 3, 5, 0 }, 1, 3, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_LAND, FL_NONE, 14, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_ITEMS, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_ITEMS, SIZE_SMALL }, // kobolds ('K') @@ -2782,7 +2777,7 @@ static monsterentry mondata[] = { MONS_NAGA, 'N', GREEN, "naga", M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, MR_RES_POISON, - 750, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6, + 1000, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 5, 0 }, 6, 10, MST_NAGA, CE_POISONOUS, Z_BIG, S_SHOUT, @@ -2791,22 +2786,10 @@ static monsterentry mondata[] = { }, { - MONS_GUARDIAN_SERPENT, 'N', LIGHTGREEN, "guardian serpent", - M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, - MR_RES_POISON, - 350, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6, - { {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 8, 3, 5, 0 }, - 6, 14, MST_GUARDIAN_SERPENT, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT, - I_HIGH, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY, - MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE -}, - -{ MONS_NAGA_MAGE, 'N', RED, "naga mage", M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, MR_RES_POISON, - 750, 13, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6, + 1000, 13, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 6, 10, MST_NAGA_MAGE, CE_POISONOUS, Z_NOZOMBIE, S_SHOUT, @@ -2818,7 +2801,7 @@ static monsterentry mondata[] = { MONS_NAGA_WARRIOR, 'N', BLUE, "naga warrior", M_FIGHTER | M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, MR_RES_POISON, - 750, 8, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6, + 1000, 8, MONS_NAGA, MONS_NAGA, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 28}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 9, 2, 0 }, 6, 10, MST_NAGA, CE_POISONOUS, Z_NOZOMBIE, S_SHOUT, @@ -2831,7 +2814,7 @@ static monsterentry mondata[] = { M_FIGHTER | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS, MR_RES_POISON, - 750, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, MAG_IMMUNE, + 1000, 10, MONS_NAGA, MONS_NAGA, MH_NATURAL, MAG_IMMUNE, { {AT_HIT, AF_PLAIN, 27}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 15, 3, 5, 0 }, 6, 10, MST_NAGA_MAGE, CE_POISONOUS, Z_NOZOMBIE, S_SHOUT, @@ -2839,6 +2822,18 @@ static monsterentry mondata[] = { MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_LARGE }, +{ + MONS_GUARDIAN_SERPENT, 'N', LIGHTGREEN, "guardian serpent", + M_SPELLCASTER | M_SEE_INVIS | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS, + MR_RES_POISON, + 800, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6, + { {AT_HIT, AF_PLAIN, 26}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, + { 8, 3, 5, 0 }, + 6, 14, MST_GUARDIAN_SERPENT, CE_MUTAGEN_RANDOM, Z_BIG, S_SHOUT, + I_HIGH, HT_LAND, FL_NONE, 15, DEFAULT_ENERGY, + MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE +}, + // ogres ('O') { MONS_OGRE, 'O', BROWN, "ogre", @@ -2858,7 +2853,7 @@ static monsterentry mondata[] = { MONS_TWO_HEADED_OGRE, 'O', LIGHTRED, "two-headed ogre", M_WARM_BLOOD | M_TWOWEAPON | M_SPEAKS, MR_NO_FLAGS, - 1500, 15, MONS_OGRE, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4, + 1390, 15, MONS_OGRE, MONS_TWO_HEADED_OGRE, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 17}, {AT_HIT, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 1, 4, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT2, @@ -2963,7 +2958,7 @@ static monsterentry mondata[] = { { 1, 2, 3, 0 }, 0, 11, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, HT_AMPHIBIOUS, FL_NONE, 12, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY }, { @@ -2975,7 +2970,7 @@ static monsterentry mondata[] = { { 2, 3, 5, 0 }, 1, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_INSECT, HT_AMPHIBIOUS, FL_NONE, 13, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { @@ -2987,7 +2982,7 @@ static monsterentry mondata[] = { { 4, 3, 5, 0 }, 2, 15, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, HT_AMPHIBIOUS, FL_NONE, 14, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { @@ -3006,12 +3001,12 @@ static monsterentry mondata[] = { MONS_VIPER, 'S', YELLOW, "viper", M_COLD_BLOOD, MR_RES_POISON, - 400, 10, MONS_SNAKE, MONS_VIPER, MH_NATURAL, -3, + 300, 10, MONS_SNAKE, MONS_VIPER, MH_NATURAL, -3, { {AT_BITE, AF_POISON_MEDIUM, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, 4, 14, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_HISS, I_INSECT, HT_LAND, FL_NONE, 13, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { @@ -3030,10 +3025,10 @@ static monsterentry mondata[] = { MONS_ANACONDA, 'S', LIGHTGREY, "anaconda", M_COLD_BLOOD, MR_NO_FLAGS, - 600, 10, MONS_SNAKE, MONS_ANACONDA, MH_NATURAL, -3, + 750, 10, MONS_SNAKE, MONS_ANACONDA, MH_NATURAL, -3, { {AT_CONSTRICT, AF_CRUSH, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 11, 3, 5, 0 }, - 4, 16, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS, + 4, 16, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_HISS, I_INSECT, HT_LAND, FL_NONE, 18, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, @@ -3056,7 +3051,7 @@ static monsterentry mondata[] = { MONS_ROCK_TROLL, 'T', LIGHTGREY, "rock troll", M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 2200, 11, MONS_TROLL, MONS_ROCK_TROLL, MH_NATURAL, -4, + 1600, 11, MONS_TROLL, MONS_ROCK_TROLL, MH_NATURAL, -4, { {AT_BITE, AF_PLAIN, 30}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 20}, AT_NO_ATK }, { 11, 3, 5, 0 }, @@ -3069,13 +3064,13 @@ static monsterentry mondata[] = { MONS_IRON_TROLL, 'T', CYAN, "iron troll", M_WARM_BLOOD | M_SPEAKS, MR_RES_FIRE | MR_RES_COLD, - 2400, 10, MONS_TROLL, MONS_IRON_TROLL, MH_NATURAL, -5, + 1800, 10, MONS_TROLL, MONS_IRON_TROLL, MH_NATURAL, -5, { {AT_BITE, AF_PLAIN, 35}, {AT_CLAW, AF_PLAIN, 25}, {AT_CLAW, AF_PLAIN, 25}, AT_NO_ATK }, { 16, 3, 5, 0 }, 20, 4, MST_NO_SPELLS, CE_POISONOUS, Z_BIG, S_SHOUT, I_NORMAL, HT_LAND, FL_NONE, 7, DEFAULT_ENERGY, - MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_LARGE + MONUSE_OPEN_DOORS, MONEAT_NOTHING, SIZE_BIG }, { @@ -3096,7 +3091,7 @@ static monsterentry mondata[] = { MONS_BEAR, 'U', BROWN, "bear", M_WARM_BLOOD | M_SPELLCASTER, MR_NO_FLAGS, - 2000, 10, MONS_BEAR, MONS_BEAR, MH_NATURAL, -3, + 1000, 10, MONS_BEAR, MONS_BEAR, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 6}, {AT_CLAW, AF_PLAIN, 6}, AT_NO_ATK }, { 7, 3, 3, 0 }, @@ -3109,7 +3104,7 @@ static monsterentry mondata[] = { MONS_GRIZZLY_BEAR, 'U', LIGHTGREY, "grizzly bear", M_WARM_BLOOD | M_SPELLCASTER, MR_NO_FLAGS, - 2500, 10, MONS_BEAR, MONS_GRIZZLY_BEAR, MH_NATURAL, -3, + 1100, 10, MONS_BEAR, MONS_GRIZZLY_BEAR, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 12}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8}, AT_NO_ATK }, { 7, 4, 4, 0 }, @@ -3122,24 +3117,24 @@ static monsterentry mondata[] = { MONS_POLAR_BEAR, 'U', WHITE, "polar bear", M_WARM_BLOOD | M_SPELLCASTER, MR_RES_COLD, - 2500, 12, MONS_BEAR, MONS_POLAR_BEAR, MH_NATURAL, -3, + 1200, 12, MONS_BEAR, MONS_POLAR_BEAR, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 5}, {AT_CLAW, AF_PLAIN, 5}, AT_NO_ATK }, { 7, 5, 3, 0 }, 7, 8, MST_BERSERK_ESCAPE, CE_CLEAN, Z_BIG, S_GROWL, I_ANIMAL, HT_AMPHIBIOUS, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { MONS_BLACK_BEAR, 'U', BLUE, "black bear", M_WARM_BLOOD | M_SPELLCASTER, MR_NO_FLAGS, - 1800, 9, MONS_BEAR, MONS_BLACK_BEAR, MH_NATURAL, -3, + 800, 9, MONS_BEAR, MONS_BLACK_BEAR, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4}, AT_NO_ATK }, { 6, 3, 3, 0 }, - 2, 8, MST_BERSERK_ESCAPE, CE_CLEAN, Z_BIG, S_GROWL, + 2, 8, MST_BERSERK_ESCAPE, CE_CLEAN, Z_SMALL, S_GROWL, I_ANIMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -3302,12 +3297,12 @@ static monsterentry mondata[] = { MONS_SHEEP, 'Y', LIGHTGREY, "sheep", M_WARM_BLOOD, MR_NO_FLAGS, - 1200, 10, MONS_SHEEP, MONS_SHEEP, MH_NATURAL, -3, + 900, 10, MONS_SHEEP, MONS_SHEEP, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 13}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, 2, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_BELLOW, I_ANIMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM }, { @@ -3319,7 +3314,7 @@ static monsterentry mondata[] = { { 7, 3, 5, 0 }, 4, 7, MST_NO_SPELLS, CE_CLEAN, Z_BIG, S_BELLOW, I_ANIMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, { @@ -3383,26 +3378,26 @@ static monsterentry mondata[] = { { 4, 3, 5, 0 }, 1, 12, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, HT_WATER, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, { MONS_GIANT_GOLDFISH, ';', LIGHTRED, "giant goldfish", M_COLD_BLOOD | M_SUBMERGES, MR_NO_FLAGS, - 500, 5, MONS_BIG_FISH, MONS_GIANT_GOLDFISH, MH_NATURAL, -3, + 450, 5, MONS_BIG_FISH, MONS_GIANT_GOLDFISH, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, 5, 7, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, I_ANIMAL, HT_WATER, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { MONS_ELECTRIC_EEL, ';', LIGHTBLUE, "electric eel", M_COLD_BLOOD | M_SPECIAL_ABILITY | M_SUBMERGES, MR_RES_ELEC, - 700, 19, MONS_ELECTRIC_EEL, MONS_ELECTRIC_EEL, MH_NATURAL, -3, + 300, 19, MONS_ELECTRIC_EEL, MONS_ELECTRIC_EEL, MH_NATURAL, -3, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, 1, 15, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT, @@ -3414,11 +3409,11 @@ static monsterentry mondata[] = { MONS_JELLYFISH, 'J', CYAN, "jellyfish", M_NO_SKELETON | M_SUBMERGES, MR_RES_POISON, - 1000, 10, MONS_JELLYFISH, MONS_JELLYFISH, MH_NATURAL, -3, + 200, 10, MONS_JELLYFISH, MONS_JELLYFISH, MH_NATURAL, -3, { {AT_STING, AF_POISON_STR, 1}, {AT_HIT, AF_PLAIN, 1}, AT_NO_ATK, AT_NO_ATK }, { 4, 3, 5, 0 }, - 0, 5, MST_NO_SPELLS, CE_POISONOUS, Z_SMALL, S_SILENT, + 0, 5, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_WATER, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE }, @@ -3435,7 +3430,7 @@ static monsterentry mondata[] = { { 7, 3, 5, 0 }, 9, 5, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_ANIMAL, HT_WATER, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_BIG }, // A kraken and its tentacles get a random colour from ETC_KRAKEN. @@ -3443,7 +3438,7 @@ static monsterentry mondata[] = { MONS_KRAKEN, 'X', BLACK, "kraken", M_NO_SKELETON | M_COLD_BLOOD | M_SPELLCASTER, MR_NO_FLAGS, - 3500, 5, MONS_KRAKEN, MONS_KRAKEN, MH_NATURAL, -3, + 3000, 5, MONS_KRAKEN, MONS_KRAKEN, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 50}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 10, 6, 0 }, 20, 0, MST_KRAKEN, CE_POISONOUS, Z_BIG, S_SILENT, @@ -3497,7 +3492,7 @@ static monsterentry mondata[] = { { 3, 3, 5, 0 }, 2, 17, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_HISS, I_ANIMAL, HT_LAVA, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { // mv: was another lava thing @@ -3515,12 +3510,12 @@ static monsterentry mondata[] = { // monsters moving through rock { MONS_ROCK_WORM, 'w', BROWN, "rock worm", - M_NO_FLAGS, + M_NO_SKELETON, MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, - 450, 12, MONS_WORM, MONS_ROCK_WORM, MH_NATURAL, -3, + 850, 12, MONS_WORM, MONS_ROCK_WORM, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 5, 5, 0 }, - 3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SILENT, + 3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT, I_PLANT, HT_ROCK, FL_NONE, 12, DEFAULT_ENERGY, MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE }, @@ -3548,7 +3543,7 @@ static monsterentry mondata[] = { 550, 10, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 5, 3, 5, 0 }, - 2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 2, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -3593,7 +3588,7 @@ static monsterentry mondata[] = { MONS_VAULT_GUARD, '@', CYAN, "vault guard", M_FIGHTER | M_WARM_BLOOD | M_SENSE_INVIS | M_SPEAKS, MR_NO_FLAGS, - 0, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3, + 550, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 13, 3, 5, 0 }, 1, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, @@ -4490,7 +4485,7 @@ static monsterentry mondata[] = { MONS_POLYPHEMUS, 'C', GREEN, "Polyphemus", M_UNIQUE | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 2500, 10, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3, + 2200, 10, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 35}, {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK }, { 12, 0, 0, 105 }, 7, 3, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SHOUT, @@ -4529,7 +4524,7 @@ static monsterentry mondata[] = { M_UNIQUE | M_SEE_INVIS | M_SPECIAL_ABILITY | M_WARM_BLOOD | M_SPEAKS, MR_RES_POISON | mrd(MR_RES_FIRE, 2) | MR_VUL_COLD, - 2200, 18, MONS_DRAGON, MONS_DRAGON, MH_NATURAL, -7, + 2400, 18, MONS_DRAGON, MONS_DRAGON, MH_NATURAL, -7, { {AT_BITE, AF_PLAIN, 35}, {AT_CLAW, AF_PLAIN, 20}, {AT_CLAW, AF_PLAIN, 17}, AT_NO_ATK }, { 19, 0, 0, 133 }, @@ -4542,12 +4537,12 @@ static monsterentry mondata[] = { MONS_LERNAEAN_HYDRA, 'D', YELLOW, "the Lernaean hydra", M_UNIQUE | M_COLD_BLOOD, MR_RES_POISON, - 1800, 11, MONS_HYDRA, MONS_LERNAEAN_HYDRA, MH_NATURAL, -3, + 2100, 11, MONS_HYDRA, MONS_LERNAEAN_HYDRA, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 18}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 30, 0, 0, 150 }, 0, 5, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_ROAR, I_INSECT, HT_AMPHIBIOUS, FL_NONE, 10, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT }, { @@ -4590,12 +4585,12 @@ static monsterentry mondata[] = { MONS_PRINCE_RIBBIT, 'F', LIGHTCYAN, "Prince Ribbit", M_UNIQUE | M_COLD_BLOOD | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SPEAKS, MR_NO_FLAGS, - 800, 12, MONS_BLINK_FROG, MONS_HUMAN, MH_NATURAL, -5, + 450, 12, MONS_BLINK_FROG, MONS_HUMAN, MH_NATURAL, -5, { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 0, 0, 40 }, 3, 12, MST_PRINCE_RIBBIT, CE_CONTAMINATED, Z_NOZOMBIE, S_CROAK, I_NORMAL, HT_AMPHIBIOUS, FL_NONE, 14, SWIM_ENERGY(6), - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LITTLE + MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL }, { @@ -4614,7 +4609,7 @@ static monsterentry mondata[] = { MONS_GRUM, 'g', LIGHTRED, "Grum", M_UNIQUE | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 750, 19, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3, + 680, 19, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 0, 0, 40 }, 2, 9, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_GROWL, @@ -4626,10 +4621,10 @@ static monsterentry mondata[] = { MONS_CRAZY_YIUF, 'g', BLACK, "Crazy Yiuf", M_WARM_BLOOD | M_SPEAKS | M_UNIQUE, MR_NO_FLAGS, - 750, 10, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3, + 680, 10, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 0, 0, 20 }, - 2, 9, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SHOUT, + 2, 9, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT, I_NORMAL, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_MEDIUM }, @@ -4644,7 +4639,7 @@ static monsterentry mondata[] = { { 21, 0, 0, 230 }, 8, 4, MST_NO_SPELLS, CE_CLEAN, Z_NOZOMBIE, S_SILENT, I_PLANT, HT_LAND, FL_NONE, 16, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_ITEMS, SIZE_SMALL + MONUSE_NOTHING, MONEAT_ITEMS, SIZE_MEDIUM }, { @@ -4665,12 +4660,12 @@ static monsterentry mondata[] = { M_NO_SKELETON | M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_SEE_INVIS | M_SPEAKS | M_NO_WAND, MR_NO_FLAGS, - 1500, 10, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3, + 1800, 10, MONS_GIANT_SLUG, MONS_ELEPHANT_SLUG, MH_NATURAL, -3, { {AT_BITE, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 20, 0, 0, 150 }, 2, 1, MST_GASTRONOK, CE_POISONOUS, Z_NOZOMBIE, S_GURGLE, I_NORMAL, HT_AMPHIBIOUS, FL_NONE, 5, DEFAULT_ENERGY, - MONUSE_STARTING_EQUIPMENT, MONEAT_FOOD, SIZE_LARGE + MONUSE_STARTING_EQUIPMENT, MONEAT_FOOD, SIZE_BIG }, { @@ -4755,7 +4750,7 @@ static monsterentry mondata[] = { M_SPELLCASTER | M_SEE_INVIS | M_WARM_BLOOD | M_SPEAKS | M_ACTUAL_SPELLS | M_UNIQUE, MR_RES_POISON, - 350, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6, + 800, 10, MONS_GUARDIAN_SERPENT, MONS_GUARDIAN_SERPENT, MH_NATURAL, -6, { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 14, 0, 0, 142 }, 8, 18, MST_AIZUL, CE_MUTAGEN_RANDOM, Z_NOZOMBIE, S_SHOUT, @@ -4869,7 +4864,7 @@ static monsterentry mondata[] = { MONS_PURGY, 'T', GREEN, "Purgy", M_UNIQUE | M_WARM_BLOOD | M_SPEAKS, MR_NO_FLAGS, - 900, 10, MONS_TROLL, MONS_TROLL, MH_NATURAL, -2, + 1100, 10, MONS_TROLL, MONS_TROLL, MH_NATURAL, -2, { {AT_BITE, AF_PLAIN, 9}, {AT_CLAW, AF_PLAIN, 4}, {AT_CLAW, AF_PLAIN, 4}, AT_NO_ATK }, { 5, 0, 0, 35 }, diff --git a/crawl-ref/source/rltiles/dc-corpse.txt b/crawl-ref/source/rltiles/dc-corpse.txt index e9b1179..db102c0 100644 --- a/crawl-ref/source/rltiles/dc-corpse.txt +++ b/crawl-ref/source/rltiles/dc-corpse.txt @@ -88,6 +88,7 @@ giant_blowfly CORPSE_GIANT_BLOWFLY giant_mosquito CORPSE_GIANT_MOSQUITO yellow_wasp CORPSE_YELLOW_WASP red_wasp CORPSE_RED_WASP +moth_of_wrath CORPSE_MOTH_OF_WRATH ## Aquatics (';') %back dc-misc/blood_red @@ -164,6 +165,7 @@ siren_water CORPSE_SIREN %sdir dc-mon/undead necrophage CORPSE_NECROPHAGE ghoul CORPSE_GHOUL +rotting_hulk CORPSE_ROTTING_HULK ## Orcs ('o') %back dc-misc/blood_red dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 @@ -218,8 +220,10 @@ shadow_dragon CORPSE_SHADOW_DRAGON ## Eyes ('G') %back dc-misc/blood_green giant_eyeball CORPSE_GIANT_EYEBALL +eye_of_devastation CORPSE_EYE_OF_DEVASTATION eye_of_draining CORPSE_EYE_OF_DRAINING great_orb_of_eyes CORPSE_GREAT_ORB_OF_EYES +shining_eye CORPSE_SHINING_EYE %back dc-misc/blood_red dc-misc/blood_red1 dc-misc/blood_red2 dc-misc/blood_red3 dc-misc/blood_red4 giant_orange_brain CORPSE_GIANT_ORANGE_BRAIN @@ -229,6 +233,7 @@ griffon CORPSE_GRIFFON manticore CORPSE_MANTICORE harpy CORPSE_HARPY minotaur CORPSE_MINOTAUR +sphinx CORPSE_SPHINX ## Jellies ('J') %back dc-misc/blood_green diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 818c7c9..b4a696e 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1897,6 +1897,8 @@ static int _tileidx_corpse(const item_def &item) return TILE_CORPSE_NECROPHAGE; case MONS_GHOUL: return TILE_CORPSE_GHOUL; + case MONS_ROTTING_HULK: + return TILE_CORPSE_ROTTING_HULK; // orcs ('o') case MONS_ORC: @@ -1975,7 +1977,7 @@ static int _tileidx_corpse(const item_def &item) case MONS_SPINY_WORM: return TILE_CORPSE_SPINY_WORM; - // wasps ('y') + // flying insects ('y') case MONS_GIANT_MOSQUITO: return TILE_CORPSE_GIANT_MOSQUITO; case MONS_GIANT_BLOWFLY: @@ -1984,6 +1986,8 @@ static int _tileidx_corpse(const item_def &item) return TILE_CORPSE_YELLOW_WASP; case MONS_RED_WASP: return TILE_CORPSE_RED_WASP; + case MONS_MOTH_OF_WRATH: + return TILE_CORPSE_MOTH_OF_WRATH; // beetles ('B') case MONS_GIANT_BEETLE: @@ -2048,12 +2052,16 @@ static int _tileidx_corpse(const item_def &item) // eyes ('G') case MONS_GIANT_EYEBALL: return TILE_CORPSE_GIANT_EYEBALL; + case MONS_EYE_OF_DEVASTATION: + return TILE_CORPSE_EYE_OF_DEVASTATION; case MONS_EYE_OF_DRAINING: return TILE_CORPSE_EYE_OF_DRAINING; case MONS_GIANT_ORANGE_BRAIN: return TILE_CORPSE_GIANT_ORANGE_BRAIN; case MONS_GREAT_ORB_OF_EYES: return TILE_CORPSE_GREAT_ORB_OF_EYES; + case MONS_SHINING_EYE: + return TILE_CORPSE_SHINING_EYE; // hybrids ('H') case MONS_HIPPOGRIFF: @@ -2066,6 +2074,8 @@ static int _tileidx_corpse(const item_def &item) return TILE_CORPSE_HARPY; case MONS_MINOTAUR: return TILE_CORPSE_MINOTAUR; + case MONS_SPHINX: + return TILE_CORPSE_SPHINX; // jellies ('J') case MONS_GIANT_AMOEBA: -- 1.6.5.1