Tweak monster experience gains to better fit actual monster difficulty.

Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net>

1 files changed, 44 insertions, 44 deletions

diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index ae86a2d10d..780d26e40c 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -601,7 +601,7 @@ static monsterentry mondata[] = {
     MONS_DEEP_ELF_MAGE, 'e', MAGENTA, "deep elf mage",
     M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    450, 10, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
+    450, 12, MONS_ELF, MONS_ELF, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 3, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
@@ -858,7 +858,7 @@ static monsterentry mondata[] = {
     MONS_WAR_DOG, 'h', CYAN, "war dog",
     M_SENSE_INVIS | M_WARM_BLOOD | M_BLOOD_SCENT,
     MR_NO_FLAGS,
-    350, 10, MONS_HOUND, MONS_WAR_DOG, MH_NATURAL, -3,
+    350, 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,
@@ -919,7 +919,7 @@ static monsterentry mondata[] = {
     MONS_GIANT_SNAIL, 'j', LIGHTGREEN, "giant snail",
     M_NO_SKELETON,
     MR_NO_FLAGS,
-    900, 10, MONS_GIANT_SLUG, MONS_GIANT_SNAIL, MH_NATURAL, -3,
+    900, 7, 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,
@@ -993,7 +993,7 @@ static monsterentry mondata[] = {
     MONS_GIANT_GECKO, 'l', YELLOW, "giant gecko",
     M_COLD_BLOOD,
     MR_NO_FLAGS,
-    250, 10, MONS_GIANT_LIZARD, MONS_GIANT_GECKO, MH_NATURAL, -3,
+    250, 16, MONS_GIANT_LIZARD, MONS_GIANT_GECKO, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 3, 5, 0 },
     1, 14, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT,
@@ -1005,7 +1005,7 @@ static monsterentry mondata[] = {
     MONS_GIANT_IGUANA, 'l', BLUE, "giant iguana",
     M_COLD_BLOOD,
     MR_NO_FLAGS,
-    400, 10, MONS_GIANT_LIZARD, MONS_GIANT_IGUANA, MH_NATURAL, -3,
+    400, 13, MONS_GIANT_LIZARD, MONS_GIANT_IGUANA, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     5, 9, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_HISS,
@@ -1185,7 +1185,7 @@ static monsterentry mondata[] = {
     MONS_NECROPHAGE, 'n', LIGHTGREY, "necrophage",
     M_NO_FLAGS,
     MR_RES_POISON | MR_RES_COLD,
-    500, 10, MONS_GHOUL, MONS_NECROPHAGE, MH_UNDEAD, -5,
+    500, 12, MONS_GHOUL, MONS_NECROPHAGE, MH_UNDEAD, -5,
     { {AT_HIT, AF_ROT, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     2, 10, MST_NO_SPELLS, CE_HCL, Z_NOZOMBIE, S_SILENT,
@@ -1258,7 +1258,7 @@ static monsterentry mondata[] = {
     MONS_ORC_WARRIOR, 'o', YELLOW, "orc warrior",
     M_FIGHTER | M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    600, 10, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
+    600, 16, MONS_ORC, MONS_ORC, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 4, 6, 0 },
     0, 13, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
@@ -1386,7 +1386,7 @@ static monsterentry mondata[] = {
     MONS_RAT, 'r', BROWN, "rat",
     M_WARM_BLOOD,
     MR_NO_FLAGS,
-    200, 10, MONS_RAT, MONS_RAT, MH_NATURAL, -1,
+    200, 1, MONS_RAT, MONS_RAT, MH_NATURAL, -1,
     { {AT_BITE, AF_PLAIN, 3}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 1, 3, 0 },
     1, 10, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT,
@@ -1410,7 +1410,7 @@ static monsterentry mondata[] = {
     MONS_GREY_RAT, 'r', LIGHTGREY, "grey rat",
     M_WARM_BLOOD,
     MR_NO_FLAGS,
-    250, 10, MONS_RAT, MONS_GREY_RAT, MH_NATURAL, -3,
+    250, 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,
@@ -1483,7 +1483,7 @@ static monsterentry mondata[] = {
     MONS_SCORPION, 's', YELLOW, "scorpion",
     M_NO_SKELETON,
     MR_VUL_POISON,
-    500, 10, MONS_SCORPION, MONS_SCORPION, MH_NATURAL, -3,
+    500, 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,
@@ -1608,7 +1608,7 @@ static monsterentry mondata[] = {
     MONS_AIR_ELEMENTAL, 'v', LIGHTGREY, "air elemental",
     M_SEE_INVIS | M_INSUBSTANTIAL | M_GLOWS,
     mrd(MR_RES_ELEC, 3) | MR_RES_POISON,
-    0, 5, MONS_EARTH_ELEMENTAL, MONS_AIR_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
+    0, 6, MONS_EARTH_ELEMENTAL, MONS_AIR_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
     { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     2, 18, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
@@ -1620,7 +1620,7 @@ static monsterentry mondata[] = {
     MONS_EARTH_ELEMENTAL, '#', BROWN, "earth elemental",
     M_NO_FLAGS,
     mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, 3),
-    0, 10, MONS_EARTH_ELEMENTAL, MONS_EARTH_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
+    0, 13, MONS_EARTH_ELEMENTAL, MONS_EARTH_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE,
     { {AT_HIT, AF_PLAIN, 40}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 5, 5, 0 },
     14, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
@@ -1705,7 +1705,7 @@ static monsterentry mondata[] = {
     MONS_SWAMP_WORM, 'w', BROWN, "swamp worm",
     M_NO_SKELETON,
     MR_NO_FLAGS,
-    350, 10, MONS_WORM, MONS_SWAMP_WORM, MH_NATURAL, -3,
+    350, 12, MONS_WORM, MONS_SWAMP_WORM, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 5, 5, 0 },
     3, 12, MST_NO_SPELLS, CE_CONTAMINATED, Z_SMALL, S_SILENT,
@@ -1780,7 +1780,7 @@ static monsterentry mondata[] = {
     MONS_GIANT_MOSQUITO, 'y', WHITE, "giant mosquito",
     M_NO_SKELETON | M_BLOOD_SCENT,
     MR_VUL_POISON,
-    100, 10, MONS_GIANT_MOSQUITO, MONS_GIANT_MOSQUITO, MH_NATURAL, -3,
+    100, 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,
@@ -1970,7 +1970,7 @@ static monsterentry mondata[] = {
     MONS_BOULDER_BEETLE, 'B', LIGHTGREY, "boulder beetle",
     M_NO_SKELETON,
     MR_VUL_POISON,
-    2500, 12, MONS_GIANT_BEETLE, MONS_BOULDER_BEETLE, MH_NATURAL, -3,
+    2500, 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,
@@ -1995,7 +1995,7 @@ static monsterentry mondata[] = {
     MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant",
     M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    1600, 10, MONS_HILL_GIANT, MONS_HILL_GIANT, MH_NATURAL, -3,
+    1600, 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,
@@ -2019,7 +2019,7 @@ static monsterentry mondata[] = {
     MONS_CYCLOPS, 'C', YELLOW, "cyclops",
     M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    2500, 10, MONS_HILL_GIANT, MONS_CYCLOPS, MH_NATURAL, -3,
+    2500, 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,
@@ -2080,7 +2080,7 @@ static monsterentry mondata[] = {
     MONS_WYVERN, 'D', LIGHTRED, "wyvern",
     M_WARM_BLOOD,
     MR_NO_FLAGS,
-    2000, 10, MONS_WYVERN, MONS_WYVERN, MH_NATURAL, -3,
+    2000, 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,
@@ -2130,7 +2130,7 @@ static monsterentry mondata[] = {
     MONS_STEAM_DRAGON, 'D', BLUE, "steam dragon",
     M_SPELLCASTER | M_WARM_BLOOD,
     MR_RES_STEAM,
-    1000, 10, MONS_DRAGON, MONS_STEAM_DRAGON, MH_NATURAL, -3,
+    1000, 17, 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,
@@ -2155,7 +2155,7 @@ static monsterentry mondata[] = {
     MONS_MOTTLED_DRAGON, 'D', LIGHTMAGENTA, "mottled dragon",
     M_SPELLCASTER | M_WARM_BLOOD,
     MR_RES_POISON | MR_RES_FIRE | MR_RES_STICKY_FLAME,
-    1100, 10, MONS_DRAGON, MONS_MOTTLED_DRAGON, MH_NATURAL, -3,
+    1100, 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,
@@ -2508,7 +2508,7 @@ static monsterentry mondata[] = {
     MONS_OOZE, 'J', LIGHTGREY, "ooze",
     M_SENSE_INVIS,
     MR_RES_POISON | MR_RES_ASPHYX | MR_RES_ACID,
-    0, 5, MONS_JELLY, MONS_OOZE, MH_NATURAL, -6,
+    0, 3, MONS_JELLY, MONS_OOZE, MH_NATURAL, -6,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     1, 3, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SILENT,
@@ -2520,7 +2520,7 @@ static monsterentry mondata[] = {
     MONS_JELLY, 'J', LIGHTRED, "jelly",
     M_SEE_INVIS | M_SPLITS | M_ACID_SPLASH,
     MR_RES_POISON | MR_RES_ASPHYX | mrd(MR_RES_ACID, 3),
-    0, 13, MONS_JELLY, MONS_JELLY, MH_NATURAL, -3,
+    0, 15, MONS_JELLY, MONS_JELLY, MH_NATURAL, -3,
     { {AT_HIT, AF_ACID, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 5, 5, 0 },
     0, 2, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
@@ -2556,7 +2556,7 @@ static monsterentry mondata[] = {
     MONS_GIANT_AMOEBA, 'J', BLUE, "giant amoeba",
     M_NO_SKELETON | M_SENSE_INVIS,
     MR_RES_POISON | MR_RES_ASPHYX,
-    1000, 10, MONS_JELLY, MONS_GIANT_AMOEBA, MH_NATURAL, -3,
+    1000, 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,
@@ -2681,7 +2681,7 @@ static monsterentry mondata[] = {
     MONS_MUMMY, 'M', LIGHTGREY, "mummy",
     M_NO_FLAGS,
     MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
-    0, 10, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, -5,
+    0, 21, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, -5,
     { {AT_HIT, AF_PLAIN, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 5, 3, 0 },
     3, 6, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
@@ -2792,7 +2792,7 @@ static monsterentry mondata[] = {
     MONS_OGRE, 'O', BROWN, "ogre",
     M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    1300, 10, MONS_OGRE, MONS_OGRE, MH_NATURAL, -3,
+    1300, 9, MONS_OGRE, MONS_OGRE, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 17}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 5, 3, 5, 0 },
     1, 6, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SHOUT,
@@ -3314,7 +3314,7 @@ static monsterentry mondata[] = {
     MONS_BIG_FISH, ';', LIGHTGREEN, "big fish",
     M_COLD_BLOOD,
     MR_NO_FLAGS,
-    300, 10, MONS_BIG_FISH, MONS_BIG_FISH, MH_NATURAL, -3,
+    300, 7, MONS_BIG_FISH, MONS_BIG_FISH, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 4, 3, 5, 0 },
     1, 12, MST_NO_SPELLS, CE_CLEAN, Z_SMALL, S_SILENT,
@@ -3326,7 +3326,7 @@ static monsterentry mondata[] = {
     MONS_GIANT_GOLDFISH, ';', LIGHTRED, "giant goldfish",
     M_COLD_BLOOD,
     MR_NO_FLAGS,
-    500, 10, MONS_BIG_FISH, MONS_GIANT_GOLDFISH, MH_NATURAL, -3,
+    500, 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,
@@ -3338,7 +3338,7 @@ static monsterentry mondata[] = {
     MONS_ELECTRIC_EEL, ';', LIGHTBLUE, "electric eel",
     M_COLD_BLOOD | M_SPECIAL_ABILITY,
     MR_RES_ELEC,
-    700, 10, MONS_ELECTRIC_EEL, MONS_ELECTRIC_EEL, MH_NATURAL, -3,
+    700, 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,
@@ -3366,7 +3366,7 @@ static monsterentry mondata[] = {
     MONS_SHARK, ';', WHITE, "shark",
     M_NO_SKELETON | M_COLD_BLOOD | M_BLOOD_SCENT,
     MR_NO_FLAGS,
-    2000, 12, MONS_SHARK, MONS_SHARK, MH_NATURAL, -3,
+    2000, 10, MONS_SHARK, MONS_SHARK, MH_NATURAL, -3,
     { {AT_BITE, AF_PLAIN, 15}, {AT_BITE, AF_PLAIN, 8}, AT_NO_ATK, AT_NO_ATK },
     { 7, 3, 5, 0 },
     9, 5, MST_NO_SPELLS, CE_CONTAMINATED, Z_BIG, S_SILENT,
@@ -3404,7 +3404,7 @@ static monsterentry mondata[] = {
     MONS_LAVA_WORM, 'w', RED, "lava worm",
     M_NO_FLAGS,
     mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
-    0, 10, MONS_LAVA_WORM, MONS_LAVA_WORM, MH_NATURAL, -3,
+    0, 6, MONS_LAVA_WORM, MONS_LAVA_WORM, MH_NATURAL, -3,
     { {AT_BITE, AF_FIRE, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 3, 5, 0 },
     1, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_SILENT,
@@ -3428,7 +3428,7 @@ static monsterentry mondata[] = {
     MONS_LAVA_SNAKE, 'S', RED, "lava snake",
     M_WARM_BLOOD | M_SPECIAL_ABILITY,
     mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
-    0, 10, MONS_SNAKE, MONS_LAVA_SNAKE, MH_NATURAL, -3,
+    0, 17, MONS_SNAKE, MONS_LAVA_SNAKE, MH_NATURAL, -3,
     { {AT_BITE, AF_FIRE, 7}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 3, 5, 0 },
     2, 17, MST_NO_SPELLS, CE_NOCORPSE, Z_SMALL, S_HISS,
@@ -3710,7 +3710,7 @@ static monsterentry mondata[] = {
     MONS_UFETUBUS, '5', LIGHTCYAN, "ufetubus",
     M_NO_FLAGS,
     MR_VUL_FIRE | MR_RES_COLD,
-    0, 10, MONS_UFETUBUS, MONS_UFETUBUS, MH_DEMONIC, -3,
+    0, 28, MONS_UFETUBUS, MONS_UFETUBUS, MH_DEMONIC, -3,
     { {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK },
     { 1, 4, 6, 0 },
     2, 15, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT,
@@ -3722,7 +3722,7 @@ static monsterentry mondata[] = {
     MONS_MANES, '5', LIGHTRED, "manes",
     M_NO_FLAGS,
     MR_RES_ELEC | MR_RES_FIRE | MR_RES_COLD | MR_RES_POISON,
-    0, 10, MONS_MANES, MONS_MANES, MH_DEMONIC, -3,
+    0, 14, MONS_MANES, MONS_MANES, MH_DEMONIC, -3,
     { {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 3}, {AT_HIT, AF_PLAIN, 3},
        AT_NO_ATK },
     { 3, 3, 5, 0 },
@@ -4281,7 +4281,7 @@ static monsterentry mondata[] = {
     MONS_GARGOYLE, '9', LIGHTGREY, "gargoyle",
     M_NO_FLAGS,
     MR_RES_POISON | MR_RES_ELEC,
-    0, 12, MONS_GARGOYLE, MONS_GARGOYLE, MH_NONLIVING, -6,
+    0, 26, MONS_GARGOYLE, MONS_GARGOYLE, MH_NONLIVING, -6,
     { {AT_BITE, AF_PLAIN, 10}, {AT_CLAW, AF_PLAIN, 6}, {AT_CLAW, AF_PLAIN, 6},
        AT_NO_ATK },
     { 4, 3, 5, 0 },
@@ -4295,7 +4295,7 @@ static monsterentry mondata[] = {
     MONS_METAL_GARGOYLE, '9', CYAN, "metal gargoyle",
     M_NO_FLAGS,
     MR_RES_POISON | MR_RES_ELEC,
-    0, 12, MONS_GARGOYLE, MONS_METAL_GARGOYLE, MH_NONLIVING, -6,
+    0, 18, MONS_GARGOYLE, MONS_METAL_GARGOYLE, MH_NONLIVING, -6,
     { {AT_BITE, AF_PLAIN, 19}, {AT_CLAW, AF_PLAIN, 10},
       {AT_CLAW, AF_PLAIN, 10}, AT_NO_ATK },
     { 8, 3, 5, 0 },
@@ -4309,7 +4309,7 @@ static monsterentry mondata[] = {
     MONS_MOLTEN_GARGOYLE, '9', RED, "molten gargoyle",
     M_NO_FLAGS,
     MR_RES_POISON | MR_RES_ELEC | mrd(MR_RES_FIRE, 3),
-    0, 12, MONS_GARGOYLE, MONS_MOLTEN_GARGOYLE, MH_NONLIVING, -6,
+    0, 18, MONS_GARGOYLE, MONS_MOLTEN_GARGOYLE, MH_NONLIVING, -6,
     { {AT_BITE, AF_FIRE, 12}, {AT_CLAW, AF_PLAIN, 8}, {AT_CLAW, AF_PLAIN, 8},
        AT_NO_ATK },
     { 5, 3, 5, 0 },
@@ -4376,7 +4376,7 @@ static monsterentry mondata[] = {
     MONS_VAPOUR, '#', LIGHTGREY, "vapour",
     M_SPELLCASTER | M_SEE_INVIS | M_INVIS | M_CONFUSED | M_INSUBSTANTIAL,
     mrd(MR_RES_ELEC, 3) | MR_RES_POISON,
-    0, 21, MONS_VAPOUR, MONS_VAPOUR, MH_NONLIVING, MAG_IMMUNE,
+    0, 10, MONS_VAPOUR, MONS_VAPOUR, MH_NONLIVING, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 12, 2, 3, 0 },
     0, 12, MST_STORM_DRAGON, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT,
@@ -4549,7 +4549,7 @@ static monsterentry mondata[] = {
     MONS_GRUM, 'g', LIGHTRED, "Grum",
     M_UNIQUE | M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    750, 10, MONS_GNOLL, MONS_GNOLL, MH_NATURAL, -3,
+    750, 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,
@@ -4613,7 +4613,7 @@ static monsterentry mondata[] = {
     M_UNIQUE | M_WARM_BLOOD | M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS
         | M_SPEAKS,
     MR_NO_FLAGS,
-    400, 10, MONS_KOBOLD, MONS_KOBOLD, MH_NATURAL, -1,
+    400, 12, MONS_KOBOLD, MONS_KOBOLD, MH_NATURAL, -1,
     { {AT_HIT, AF_PLAIN, 9}, {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 5},
        AT_NO_ATK },
     { 6, 0, 0, 30 },
@@ -4627,7 +4627,7 @@ static monsterentry mondata[] = {
     MONS_PIKEL, 'K', BLUE, "Pikel",
     M_WARM_BLOOD | M_SPEAKS | M_UNIQUE | M_NO_WAND,
     MR_NO_FLAGS,
-    500, 55, MONS_KOBOLD, MONS_BIG_KOBOLD, MH_NATURAL, -3,
+    500, 49, MONS_KOBOLD, MONS_BIG_KOBOLD, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 9}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 6, 0, 0, 40 },
     4, 12, MST_NO_SPELLS, CE_POISONOUS, Z_NOZOMBIE, S_SHOUT,
@@ -4653,7 +4653,7 @@ static monsterentry mondata[] = {
     MONS_MENKAURE, 'M', MAGENTA, "Menkaure",
     M_UNIQUE | M_SPEAKS | M_SEE_INVIS | M_SPELLCASTER | M_ACTUAL_SPELLS,
     MR_RES_POISON | MR_VUL_FIRE | MR_RES_COLD,
-    0, 20, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, -5,
+    0, 48, MONS_MUMMY, MONS_MUMMY, MH_UNDEAD, -5,
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 3, 0, 0, 24 },
     3, 6, MST_MENKAURE, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT,
@@ -4856,7 +4856,7 @@ static monsterentry mondata[] = {
     MONS_JESSICA, '@', LIGHTGREY, "Jessica",
     M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    550, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
+    550, 125, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
     { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 1, 0, 0, 10 },
     0, 10, MST_JESSICA, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
@@ -4965,7 +4965,7 @@ static monsterentry mondata[] = {
     MONS_NORBERT, '@', BROWN, "Norbert",
     M_UNIQUE | M_FIGHTER | M_WARM_BLOOD | M_SPEAKS,
     MR_NO_FLAGS,
-    550, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
+    550, 15, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 25}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 10, 0, 0, 105 },
     0, 10, MST_NO_SPELLS, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,
@@ -5078,7 +5078,7 @@ static monsterentry mondata[] = {
     M_UNIQUE | M_SPELLCASTER | M_ACTUAL_SPELLS | M_WARM_BLOOD | M_SEE_INVIS
         | M_SPEAKS,
     MR_NO_FLAGS,
-    550, 12, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
+    550, 4, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -5,
     { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 17, 0, 0, 140 },
     1, 10, MST_ORC_PRIEST, CE_CONTAMINATED, Z_NOZOMBIE, S_SHOUT,