Simplify mon-pick-data.h weights

Every weight greater than 200 or so has been rounded to the nearest
multiple of 5. This should simplify the numbers without significantly
affecting gameplay.

1 files changed, 234 insertions, 234 deletions

diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index 416f40dff2..b55cd48e9f 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -1,108 +1,108 @@
 static const pop_entry pop_d[] =
 { // Dungeon (OOD cap: 27)
-  { -3,  7,  514, SEMI, MONS_GIANT_NEWT },
-  { -2,  8,  514, SEMI, MONS_GIANT_COCKROACH },
+  { -3,  7,  515, SEMI, MONS_GIANT_NEWT },
+  { -2,  8,  515, SEMI, MONS_GIANT_COCKROACH },
   { -2,  8,  192, PEAK, MONS_BALL_PYTHON },
   { -1,  7,  136, SEMI, MONS_OOZE },
-  {  0, 10,  999, FLAT, MONS_BAT },
-  {  0, 10,  999, FLAT, MONS_KOBOLD },
-  {  0, 10,  999, FLAT, MONS_RAT },
-  {  1,  7,  999, FLAT, MONS_GOBLIN },
-  {  1, 11,  999, FLAT, MONS_HOBGOBLIN },
-  {  1, 11,  514, SEMI, MONS_GIANT_GECKO },
-  {  1, 11,  334, SEMI, MONS_JACKAL },
+  {  0, 10, 1000, FLAT, MONS_BAT },
+  {  0, 10, 1000, FLAT, MONS_KOBOLD },
+  {  0, 10, 1000, FLAT, MONS_RAT },
+  {  1,  7, 1000, FLAT, MONS_GOBLIN },
+  {  1, 11, 1000, FLAT, MONS_HOBGOBLIN },
+  {  1, 11,  515, SEMI, MONS_GIANT_GECKO },
+  {  1, 11,  335, SEMI, MONS_JACKAL },
   {  1, 11,  192, PEAK, MONS_GIANT_MITE },
   {  1, 11,  192, PEAK, MONS_GNOLL },
-  {  2, 12,  923, FLAT, MONS_ADDER },
-  {  2, 12,  514, SEMI, MONS_QUOKKA },
-  {  2,  6,  514, DOWN, MONS_WORM },
-  {  3, 13,  999, FLAT, MONS_ORC },
+  {  2, 12,  925, FLAT, MONS_ADDER },
+  {  2, 12,  515, SEMI, MONS_QUOKKA },
+  {  2,  6,  515, DOWN, MONS_WORM },
+  {  3, 13, 1000, FLAT, MONS_ORC },
   {  4, 10,   52, SEMI, MONS_GNOLL_SHAMAN },
   {  4, 12,  136, SEMI, MONS_ORC_PRIEST },
-  {  4, 14,  923, FLAT, MONS_WORKER_ANT },
-  {  4, 14,  826, SEMI, MONS_HOUND },
-  {  4, 14,  826, SEMI, MONS_OGRE },
-  {  4, 14,  514, SEMI, MONS_IGUANA },
-  {  4, 14,  514, SEMI, MONS_ORC_WIZARD },
-  {  4, 14,  514, SEMI, MONS_SCORPION },
-  {  4, 14,  334, SEMI, MONS_PHANTOM },
-  {  4, 16,  999, FLAT, MONS_SKELETON },
+  {  4, 14,  925, FLAT, MONS_WORKER_ANT },
+  {  4, 14,  825, SEMI, MONS_HOUND },
+  {  4, 14,  825, SEMI, MONS_OGRE },
+  {  4, 14,  515, SEMI, MONS_IGUANA },
+  {  4, 14,  515, SEMI, MONS_ORC_WIZARD },
+  {  4, 14,  515, SEMI, MONS_SCORPION },
+  {  4, 14,  335, SEMI, MONS_PHANTOM },
+  {  4, 16, 1000, FLAT, MONS_SKELETON },
   {  5, 13,   89, PEAK, MONS_GNOLL_SERGEANT },
   {  5, 15,  650, FLAT, MONS_CRIMSON_IMP },
   {  5, 15,  350, FLAT, MONS_SHADOW_IMP },
-  {  5, 15,  826, SEMI, MONS_CENTAUR },
-  {  5, 15,  514, SEMI, MONS_ICE_BEAST },
-  {  5, 15,  514, SEMI, MONS_JELLY },
-  {  5, 15,  514, SEMI, MONS_SKY_BEAST },
+  {  5, 15,  825, SEMI, MONS_CENTAUR },
+  {  5, 15,  515, SEMI, MONS_ICE_BEAST },
+  {  5, 15,  515, SEMI, MONS_JELLY },
+  {  5, 15,  515, SEMI, MONS_SKY_BEAST },
   {  5, 15,  192, PEAK, MONS_NECROPHAGE },
   {  5, 15,  192, PEAK, MONS_QUASIT },
   {  5, 15,  192, PEAK, MONS_WATER_MOCCASIN },
-  {  5, 16,  999, FLAT, MONS_ZOMBIE },
-  {  6, 11,  514, DOWN, MONS_GOLIATH_BEETLE },
+  {  5, 16, 1000, FLAT, MONS_ZOMBIE },
+  {  6, 11,  515, DOWN, MONS_GOLIATH_BEETLE },
   {  6, 13,  285, SEMI, MONS_BLACK_BEAR },
-  {  6, 16,  999, FLAT, MONS_GIANT_FROG },
-  {  6, 16,  826, SEMI, MONS_ORC_WARRIOR },
-  {  6, 16,  334, SEMI, MONS_GIANT_SPORE },
-  {  6, 16,  334, SEMI, MONS_WIGHT },
+  {  6, 16, 1000, FLAT, MONS_GIANT_FROG },
+  {  6, 16,  825, SEMI, MONS_ORC_WARRIOR },
+  {  6, 16,  335, SEMI, MONS_GIANT_SPORE },
+  {  6, 16,  335, SEMI, MONS_WIGHT },
   {  6, 16,  192, PEAK, MONS_MUMMY },
   {  7, 14,  415, SEMI, MONS_BIG_KOBOLD },
   {  7, 14,  500, SEMI, MONS_KILLER_BEE },
   {  7, 15,   89, PEAK, MONS_STEAM_DRAGON },
-  {  7, 17,  514, SEMI, MONS_HIPPOGRIFF },
+  {  7, 17,  515, SEMI, MONS_HIPPOGRIFF },
   {  7, 17,  350, SEMI, MONS_HUNGRY_GHOST },
   {  7, 17,  192, PEAK, MONS_CROCODILE },
   {  7, 17,  192, PEAK, MONS_YELLOW_WASP },
   {  8, 17,  300, SEMI, MONS_TWO_HEADED_OGRE },
-  {  8, 18,  334, SEMI, MONS_WYVERN },
+  {  8, 18,  335, SEMI, MONS_WYVERN },
   {  8, 18,  230, PEAK, MONS_EYE_OF_DRAINING },
-  {  9, 14,  826, SEMI, MONS_YAK },
+  {  9, 14,  825, SEMI, MONS_YAK },
   {  9, 16,  475, SEMI, MONS_DEEP_ELF_MAGE },
   {  9, 17,  370, SEMI, MONS_GARGOYLE },
-  {  9, 17,  826, SEMI, MONS_TROLL },
+  {  9, 17,  825, SEMI, MONS_TROLL },
   { 10, 16,  194, PEAK, MONS_SOLDIER_ANT },
-  { 10, 18,  999, FLAT, MONS_HILL_GIANT },
-  { 10, 18,  334, SEMI, MONS_WRAITH },
+  { 10, 18, 1000, FLAT, MONS_HILL_GIANT },
+  { 10, 18,  335, SEMI, MONS_WRAITH },
   { 10, 18,  220, PEAK, MONS_TRAPDOOR_SPIDER },
-  { 10, 20,  514, SEMI, MONS_UNSEEN_HORROR },
+  { 10, 20,  515, SEMI, MONS_UNSEEN_HORROR },
   { 10, 20,  192, PEAK, MONS_KOMODO_DRAGON },
   { 11, 18,  235, SEMI, MONS_KOBOLD_DEMONOLOGIST },
   { 11, 18,  750, FLAT, MONS_UGLY_THING },
   { 11, 21,  420, SEMI, MONS_MANTICORE },
-  { 11, 21,  826, SEMI, MONS_CYCLOPS },
+  { 11, 21,  825, SEMI, MONS_CYCLOPS },
   { 11, 21,  380, SEMI, MONS_SHADOW },
-  { 11, 21,  334, SEMI, MONS_MOTTLED_DRAGON },
-  { 11, 21,  258, PEAK, MONS_BASILISK },
+  { 11, 21,  335, SEMI, MONS_MOTTLED_DRAGON },
+  { 11, 21,  260, PEAK, MONS_BASILISK },
   { 11, 21,  192, PEAK, MONS_SKELETAL_WARRIOR },
   { 11, 21,  146, PEAK, MONS_BRAIN_WORM },
-  { 11, 23,  514, SEMI, MONS_HYDRA },
-  { 12, 20,  514, SEMI, MONS_VAMPIRE_MOSQUITO },
+  { 11, 23,  515, SEMI, MONS_HYDRA },
+  { 12, 20,  515, SEMI, MONS_VAMPIRE_MOSQUITO },
   { 12, 22,  440, DOWN, MONS_SLIME_CREATURE },
   { 12, 22,  192, PEAK, MONS_VAMPIRE },
   { 13, 21,   89, PEAK, MONS_RAKSHASA },
-  { 13, 17,  923, FLAT, MONS_CENTAUR_WARRIOR },
-  { 18, 23,  923, DOWN, MONS_CENTAUR_WARRIOR },
+  { 13, 17,  925, FLAT, MONS_CENTAUR_WARRIOR },
+  { 18, 23,  925, DOWN, MONS_CENTAUR_WARRIOR },
   { 13, 19,  365, SEMI, MONS_TENGU_WARRIOR },
   { 13, 19,  205, SEMI, MONS_TENGU_CONJURER },
   { 13, 19,  285, SEMI, MONS_EFREET },
-  { 13, 23,  674, SEMI, MONS_SHAPESHIFTER },
-  { 13, 23,  334, SEMI, MONS_GRIFFON },
+  { 13, 23,  675, SEMI, MONS_SHAPESHIFTER },
+  { 13, 23,  335, SEMI, MONS_GRIFFON },
   { 13, 27,   89, DOWN, MONS_CATOBLEPAS },
   { 14, 19,  140, FLAT, MONS_WIZARD },
   { 14, 20,  136, SEMI, MONS_DEEP_ELF_FIGHTER },
-  { 14, 22,  258, SEMI, MONS_FREEZING_WRAITH },
-  { 14, 22,  272, SEMI, MONS_SIMULACRUM },
+  { 14, 22,  260, SEMI, MONS_FREEZING_WRAITH },
+  { 14, 22,  270, SEMI, MONS_SIMULACRUM },
   { 14, 22,  115, SEMI, MONS_BOGGART },
   { 14, 27,  192, PEAK, MONS_FIRE_DRAGON },
-  { 15, 20,  334, SEMI, MONS_YAKTAUR },
+  { 15, 20,  335, SEMI, MONS_YAKTAUR },
   { 15, 24,  345, DOWN, MONS_ORC_KNIGHT },
   { 15, 25,  315, DOWN, MONS_OGRE_MAGE },
-  { 15, 25,  273, PEAK, MONS_WOLF_SPIDER },
+  { 15, 25,  275, PEAK, MONS_WOLF_SPIDER },
   { 16, 24,   89, PEAK, MONS_REDBACK },
   { 16, 24,   66, PEAK, MONS_BORING_BEETLE },
   { 16, 24,   25, PEAK, MONS_SHADOW_WRAITH },
   { 16, 27,   92, PEAK, MONS_ICE_DRAGON },
   { 17, 23,   89, PEAK, MONS_VERY_UGLY_THING },
-  { 17, 24,  244, PEAK, MONS_BOULDER_BEETLE },
+  { 17, 24,  245, PEAK, MONS_BOULDER_BEETLE },
   { 17, 24,  102, SEMI, MONS_GREAT_ORB_OF_EYES },
   { 17, 24,   52, SEMI, MONS_NECROMANCER },
   { 17, 25,  136, SEMI, MONS_DEEP_ELF_KNIGHT },
@@ -199,7 +199,7 @@ static const pop_entry pop_dwarf[] =
 { // Dwarven Hall
   {  1,  1, 1000, FLAT, MONS_DEEP_DWARF },
   {  1,  1,  690, FLAT, MONS_DEATH_KNIGHT },
-  {  1,  1,  334, FLAT, MONS_UNBORN },
+  {  1,  1,  335, FLAT, MONS_UNBORN },
   {  1,  1,    3, FLAT, MONS_DEEP_TROLL },
   {  1,  1,    3, FLAT, MONS_DEEP_TROLL_EARTH_MAGE },
   {  1,  1,    3, FLAT, MONS_DEEP_TROLL_SHAMAN },
@@ -222,39 +222,39 @@ static const pop_entry pop_blade[] =
 
 static const pop_entry pop_lair[] =
 { // Lair
-  { -4,  6,  826, SEMI, MONS_IGUANA },
-  {  1,  6,  999, FLAT, MONS_QUOKKA },
-  {  1,  7,  999, FLAT, MONS_PORCUPINE },
+  { -4,  6,  825, SEMI, MONS_IGUANA },
+  {  1,  6, 1000, FLAT, MONS_QUOKKA },
+  {  1,  7, 1000, FLAT, MONS_PORCUPINE },
   { -3,  7,  690, SEMI, MONS_HOUND },
-  {  1,  7,  999, FLAT, MONS_GIANT_FROG },
+  {  1,  7, 1000, FLAT, MONS_GIANT_FROG },
   { -1,  5,   52, SEMI, MONS_BLACK_BEAR },
-  {  1,  8,  923, FLAT, MONS_ADDER },
-  { -2,  8,  749, SEMI, MONS_GREEN_RAT },
-  {  1,  8,  981, FLAT, MONS_CROCODILE },
+  {  1,  8,  925, FLAT, MONS_ADDER },
+  { -2,  8,  750, SEMI, MONS_GREEN_RAT },
+  {  1,  8,  980, FLAT, MONS_CROCODILE },
   {  0,  6,   25, PEAK, MONS_SCORPION },
-  {  0,  8,  258, SEMI, MONS_BASILISK },
-  {  1,  8,  981, FLAT, MONS_WATER_MOCCASIN },
-  {  0,  8,  258, SEMI, MONS_WOLF },
-  {  1,  8,  514, FLAT, MONS_HIPPOGRIFF },
-  {  1,  8,  879, FLAT, MONS_SPINY_FROG },
+  {  0,  8,  260, SEMI, MONS_BASILISK },
+  {  1,  8,  980, FLAT, MONS_WATER_MOCCASIN },
+  {  0,  8,  260, SEMI, MONS_WOLF },
+  {  1,  8,  515, FLAT, MONS_HIPPOGRIFF },
+  {  1,  8,  880, FLAT, MONS_SPINY_FROG },
   {  2,  6,    8, PEAK, MONS_YELLOW_WASP },
-  {  1,  8,  514, FLAT, MONS_KOMODO_DRAGON },
+  {  1,  8,  515, FLAT, MONS_KOMODO_DRAGON },
   {  2,  8,   25, PEAK, MONS_ORANGE_RAT },
-  {  1,  9,  273, SEMI, MONS_SHEEP },
-  {  1,  8,  514, FLAT, MONS_YAK },
+  {  1,  9,  275, SEMI, MONS_SHEEP },
+  {  1,  8,  515, FLAT, MONS_YAK },
   {  2,  8,   52, SEMI, MONS_POLAR_BEAR },
   {  1,  9,  420, SEMI, MONS_BLINK_FROG },
   {  2,  8,   25, PEAK, MONS_STEAM_DRAGON },
-  {  1, 11,  457, SEMI, MONS_BLACK_MAMBA },
-  {  1, 11,  514, SEMI, MONS_HYDRA },
+  {  1, 11,  455, SEMI, MONS_BLACK_MAMBA },
+  {  1, 11,  515, SEMI, MONS_HYDRA },
   {  3,  9,   52, SEMI, MONS_CATOBLEPAS },
   {  3,  9,  125, SEMI, MONS_TORPOR_SNAIL },
   {  4,  8,   14, SEMI, MONS_BRAIN_WORM },
   {  2, 10,   89, PEAK, MONS_WYVERN },
-  {  1, 11,  273, PEAK, MONS_FIRE_DRAKE },
+  {  1, 11,  275, PEAK, MONS_FIRE_DRAKE },
   {  4,  8,    8, PEAK, MONS_TRAPDOOR_SPIDER },
   {  3,  9,   25, PEAK, MONS_OKLOB_PLANT },
-  {  2, 12,  273, PEAK, MONS_ELEPHANT },
+  {  2, 12,  275, PEAK, MONS_ELEPHANT },
   {  2, 12,  192, PEAK, MONS_GRIFFON },
   {  4, 10,   52, SEMI, MONS_POLAR_BEAR },
   {  4, 10,   25, PEAK, MONS_LINDWURM },
@@ -271,19 +271,19 @@ static const pop_entry pop_lair[] =
 
 static const pop_entry pop_swamp[] =
 { // Swamp
-  {  1,  5,  999, FLAT, MONS_FUNGUS },
+  {  1,  5, 1000, FLAT, MONS_FUNGUS },
   {  1,  5, 1000, FLAT, MONS_PLANT },
-  {  1,  5,  879, FLAT, MONS_WATER_MOCCASIN },
+  {  1,  5,  880, FLAT, MONS_WATER_MOCCASIN },
   {  1,  5, 1000, FLAT, MONS_ALLIGATOR },
   { -2,  5,  155, FLAT, MONS_GIANT_FROG },
-  {  1,  5,  923, FLAT, MONS_SWAMP_DRAKE },
+  {  1,  5,  925, FLAT, MONS_SWAMP_DRAKE },
   { -2,  5,  345, FLAT, MONS_RAVEN },
   { -2,  5,  275, SEMI, MONS_CROCODILE },
   {  1,  5,  915, FLAT, MONS_HYDRA },
   {  1,  5,  665, FLAT, MONS_VAMPIRE_MOSQUITO },
-  {  1,  5,  923, FLAT, MONS_BOG_BODY },
+  {  1,  5,  925, FLAT, MONS_BOG_BODY },
   {  1,  5,  100, DOWN, MONS_KOMODO_DRAGON },
-  {  1,  5,  826, FLAT, MONS_GIANT_LEECH },
+  {  1,  5,  825, FLAT, MONS_GIANT_LEECH },
   {  1,  5, 1000, FLAT, MONS_SPINY_FROG },
   {  1,  5,  500, FLAT, MONS_SWAMP_DRAGON },
   {  1,  5,  192, FLAT, MONS_RED_WASP },
@@ -353,20 +353,20 @@ static const pop_entry pop_snake[] =
 
 static const pop_entry pop_spider[] =
 { // Spider Nest
-  {  1,  5,  334, FLAT, MONS_SPIDER },
-  {  1,  5,  258, FLAT, MONS_SCORPION },
+  {  1,  5,  335, FLAT, MONS_SPIDER },
+  {  1,  5,  260, FLAT, MONS_SCORPION },
   {  1,  5,   52, FLAT, MONS_YELLOW_WASP },
-  {  1,  5,  879, FLAT, MONS_TRAPDOOR_SPIDER },
-  {  1,  5,  607, FLAT, MONS_REDBACK },
+  {  1,  5,  880, FLAT, MONS_TRAPDOOR_SPIDER },
+  {  1,  5,  605, FLAT, MONS_REDBACK },
   {  1,  7,   52, SEMI, MONS_BORING_BEETLE },
   {  1,  7,   89, SEMI, MONS_BOULDER_BEETLE },
-  {  1,  7,  763, FLAT, MONS_JUMPING_SPIDER },
-  {  1,  7,  552, FLAT, MONS_ORB_SPIDER },
+  {  1,  7,  765, FLAT, MONS_JUMPING_SPIDER },
+  {  1,  7,  550, FLAT, MONS_ORB_SPIDER },
   {  1,  7,  690, FLAT, MONS_TARANTELLA },
-  {  0,  5,  258, UP,   MONS_RED_WASP },
-  {  1,  5,  957, FLAT, MONS_WOLF_SPIDER },
+  {  0,  5,  260, UP,   MONS_RED_WASP },
+  {  1,  5,  955, FLAT, MONS_WOLF_SPIDER },
   {  2,  7,  190, SEMI, MONS_EMPEROR_SCORPION },
-  {  0, 10,  763, SEMI, MONS_DEMONIC_CRAWLER },
+  {  0, 10,  765, SEMI, MONS_DEMONIC_CRAWLER },
   {  2, 10,  200, PEAK, MONS_GHOST_MOTH },
   {  2,  7,  155, SEMI, MONS_MOTH_OF_WRATH },
   {  1,  7,  175, FLAT, MONS_TORPOR_SNAIL },
@@ -379,12 +379,12 @@ static const pop_entry pop_slime[] =
   {  1,  6, 2000, FLAT, MONS_JELLY },
   {  1,  6, 1000, FLAT, MONS_ACID_BLOB },
   {  0,  6, 2000, FLAT, MONS_SLIME_CREATURE },
-  {  0,  6,  514, FLAT, MONS_EYE_OF_DRAINING },
-  {  1,  6,  514, FLAT, MONS_AZURE_JELLY },
-  {  1,  6,  514, FLAT, MONS_SHINING_EYE },
+  {  0,  6,  515, FLAT, MONS_EYE_OF_DRAINING },
+  {  1,  6,  515, FLAT, MONS_AZURE_JELLY },
+  {  1,  6,  515, FLAT, MONS_SHINING_EYE },
   {  1,  6,  200, FLAT, MONS_GOLDEN_EYE },
   {  1,  9,  300, SEMI, MONS_EYE_OF_DEVASTATION },
-  {  1,  9,  389, SEMI, MONS_GREAT_ORB_OF_EYES },
+  {  1,  9,  390, SEMI, MONS_GREAT_ORB_OF_EYES },
   {  1,  6,  200, UP,   MONS_DEATH_OOZE },
   {  2,  6,  100, UP,   MONS_GIANT_ORANGE_BRAIN },
   {  1,  6,  800, FLAT, MONS_NO_MONSTER }, // Old ooze weight
@@ -393,14 +393,14 @@ static const pop_entry pop_slime[] =
 
 static const pop_entry pop_vaults[] =
 { // Vaults (OOD cap: 12)
-  { -7,  3,  514, SEMI, MONS_VAMPIRE_MOSQUITO },
-  { -6,  4,  674, SEMI, MONS_SHAPESHIFTER },
-  { -6,  4,  334, SEMI, MONS_GRIFFON },
-  { -5,  3,  272, SEMI, MONS_SIMULACRUM },
+  { -7,  3,  515, SEMI, MONS_VAMPIRE_MOSQUITO },
+  { -6,  4,  675, SEMI, MONS_SHAPESHIFTER },
+  { -6,  4,  335, SEMI, MONS_GRIFFON },
+  { -5,  3,  270, SEMI, MONS_SIMULACRUM },
   { -5,  3,  136, SEMI, MONS_BOGGART },
   { -5,  5,  192, PEAK, MONS_FIRE_DRAGON },
   { -4,  6,  420, SEMI, MONS_OGRE_MAGE },
-  { -4,  6,  334, SEMI, MONS_YAKTAUR },
+  { -4,  6,  335, SEMI, MONS_YAKTAUR },
   { -2,  6,  136, SEMI, MONS_GREAT_ORB_OF_EYES },
   { -2,  6,  136, SEMI, MONS_RED_WASP },
   { -2,  6,  136, SEMI, MONS_DEEP_ELF_FIGHTER },
@@ -409,18 +409,18 @@ static const pop_entry pop_vaults[] =
   { -2,  6,   89, PEAK, MONS_HARPY },
   { -2,  6,   89, PEAK, MONS_FIRE_CRAB },
   { -2,  6,   89, PEAK, MONS_VERY_UGLY_THING },
-  { -2,  8,  244, PEAK, MONS_BOULDER_BEETLE },
+  { -2,  8,  245, PEAK, MONS_BOULDER_BEETLE },
   { -1,  5,   89, PEAK, MONS_GIANT_ORANGE_BRAIN },
-  { -1,  9,  258, PEAK, MONS_FREEZING_WRAITH },
+  { -1,  9,  260, PEAK, MONS_FREEZING_WRAITH },
   { -1,  9,   89, PEAK, MONS_SHADOW_WRAITH },
   { -1,  9,   60, PEAK, MONS_FLAYED_GHOST },
   {  0,  8,   89, PEAK, MONS_REDBACK },
   {  0, 12,   89, PEAK, MONS_SPHINX },
   {  1,  1,  440, FLAT, MONS_HILL_GIANT },
-  {  1,  1,  257, FLAT, MONS_UNSEEN_HORROR },
-  {  1,  1,  187, FLAT, MONS_WRAITH },
-  {  1,  2,  413, FLAT, MONS_CYCLOPS },
-  {  1,  2,  167, FLAT, MONS_MOTTLED_DRAGON },
+  {  1,  1,  255, FLAT, MONS_UNSEEN_HORROR },
+  {  1,  1,  185, FLAT, MONS_WRAITH },
+  {  1,  2,  415, FLAT, MONS_CYCLOPS },
+  {  1,  2,  165, FLAT, MONS_MOTTLED_DRAGON },
   {  1,  2,   89, FLAT, MONS_SKELETAL_WARRIOR },
   {  1,  2,   89, FLAT, MONS_RAKSHASA },
   {  1,  3,  440, DOWN, MONS_SLIME_CREATURE },
@@ -430,15 +430,15 @@ static const pop_entry pop_vaults[] =
   {  1,  4,  440, DOWN, MONS_UGLY_THING },
   {  1,  4,  440, DOWN, MONS_CENTAUR_WARRIOR },
   {  1,  5,   89, FLAT, MONS_NECROMANCER },
-  {  1,  6,  273, DOWN, MONS_WOLF_SPIDER },
+  {  1,  6,  275, DOWN, MONS_WOLF_SPIDER },
   {  1,  7,  690, DOWN, MONS_ORC_KNIGHT },
   {  1, 10,  640, DOWN, MONS_VAULT_SENTINEL },
   {  1, 10,  640, DOWN, MONS_IRONBRAND_CONVOKER },
-  {  1, 11,  577, DOWN, MONS_IRONHEART_PRESERVER },
-  {  1, 12,  508, DOWN, MONS_VAULT_WARDEN },
-  {  1, 12,  413, DOWN, MONS_YAKTAUR_CAPTAIN },
+  {  1, 11,  575, DOWN, MONS_IRONHEART_PRESERVER },
+  {  1, 12,  510, DOWN, MONS_VAULT_WARDEN },
+  {  1, 12,  415, DOWN, MONS_YAKTAUR_CAPTAIN },
   {  2,  6,   32, PEAK, MONS_CRYSTAL_GUARDIAN },
-  {  2, 12,  342, DOWN, MONS_STONE_GIANT },
+  {  2, 12,  340, DOWN, MONS_STONE_GIANT },
   {  2, 12,  192, PEAK, MONS_ETTIN },
   {  3, 10,   40, FLAT, MONS_DEEP_ELF_CONJURER },
   {  3, 10,   40, FLAT, MONS_DEEP_ELF_PRIEST },
@@ -503,14 +503,14 @@ static const pop_entry pop_crypt[] =
 
 static const pop_entry pop_tomb[] =
 { // Tomb (OOD cap: 5)
-  {  1,  5,  187, FLAT, MONS_ZOMBIE },
+  {  1,  5,  185, FLAT, MONS_ZOMBIE },
   {  1,  3,    3, SEMI, MONS_TRAPDOOR_SPIDER },
   {  1,  5, 1000, FLAT, MONS_MUMMY },
-  {  1,  5,  199, FLAT, MONS_SKELETON },
+  {  1,  5,  200, FLAT, MONS_SKELETON },
   {  1,  5, 1000, FLAT, MONS_GUARDIAN_MUMMY },
   {  1,  5,  230, FLAT, MONS_FLYING_SKULL },
   {  1,  5,   50, SEMI, MONS_SIMULACRUM },
-  { -1,  9,  334, SEMI, MONS_MUMMY_PRIEST },
+  { -1,  9,  335, SEMI, MONS_MUMMY_PRIEST },
   {  3,  5,    6, FLAT, MONS_LICH },
   {  3,  5,    3, SEMI, MONS_ANCIENT_LICH },
   {  4,  5,    3, UP,   MONS_GREATER_MUMMY },
@@ -530,16 +530,16 @@ static const pop_entry pop_hell[] =
   {  1,  1,   25, FLAT, MONS_HELLION },
   {  1,  1,   89, FLAT, MONS_LOROCYPROCA },
   {  1,  1,   25, FLAT, MONS_TORMENTOR },
-  {  1,  1,  514, FLAT, MONS_REAPER },
-  {  1,  1,  514, FLAT, MONS_SOUL_EATER },
-  {  1,  1,  514, FLAT, MONS_ICE_DEVIL },
+  {  1,  1,  515, FLAT, MONS_REAPER },
+  {  1,  1,  515, FLAT, MONS_SOUL_EATER },
+  {  1,  1,  515, FLAT, MONS_ICE_DEVIL },
   {  1,  1,   89, FLAT, MONS_BLUE_DEVIL },
   {  1,  1,   89, FLAT, MONS_IRON_DEVIL },
   {  1,  1,   52, FLAT, MONS_GREEN_DEATH },
   {  1,  1,   52, FLAT, MONS_BLIZZARD_DEMON },
   {  1,  1,   52, FLAT, MONS_BALRUG },
   {  1,  1,   52, FLAT, MONS_CACODEMON },
-  {  1,  1,  514, FLAT, MONS_SUN_DEMON },
+  {  1,  1,  515, FLAT, MONS_SUN_DEMON },
   {  1,  1,   25, FLAT, MONS_TENTACLED_MONSTROSITY },
   { 0,0,0,FLAT,MONS_0 }
 };
@@ -547,35 +547,35 @@ static const pop_entry pop_hell[] =
 static const pop_entry pop_dis[] =
 { // Dis
   {  1,  2,    8, DOWN, MONS_CRIMSON_IMP },
-  {  1,  7,  539, DOWN, MONS_RED_DEVIL },
+  {  1,  7,  540, DOWN, MONS_RED_DEVIL },
   {  1,  7,  136, DOWN, MONS_NECROPHAGE },
-  {  1, 12,  514, DOWN, MONS_SKELETAL_WARRIOR },
-  {  1,  7, 1998, FLAT, MONS_ZOMBIE },
-  {  1, 12,  438, DOWN, MONS_HELL_HOUND },
+  {  1, 12,  515, DOWN, MONS_SKELETAL_WARRIOR },
+  {  1,  7, 2000, FLAT, MONS_ZOMBIE },
+  {  1, 12,  440, DOWN, MONS_HELL_HOUND },
   {  1,  7,   25, DOWN, MONS_HELL_KNIGHT },
-  {  1,  7,  776, FLAT, MONS_TORMENTOR },
+  {  1,  7,  775, FLAT, MONS_TORMENTOR },
   {  1,  7,   66, DOWN, MONS_PHANTOM },
-  {  1,  5,  624, DOWN, MONS_SHADOW },
+  {  1,  5,  625, DOWN, MONS_SHADOW },
   {  1,  6,  420, DOWN, MONS_WIGHT },
-  {  1, 12,  272, DOWN, MONS_SKELETON },
+  {  1, 12,  270, DOWN, MONS_SKELETON },
   {  1,  7,   89, DOWN, MONS_HELL_HOG },
   {  1, 12,   60, DOWN, MONS_IRON_GOLEM },
   {  1,  7,  300, FLAT, MONS_HELLION },
   {  1,  7,   25, FLAT, MONS_EFREET },
   {  1,  7,  420, DOWN, MONS_MUMMY },
-  {  1,  7,  258, DOWN, MONS_FLYING_SKULL },
-  {  1,  7,  999, FLAT, MONS_IRON_IMP },
-  {  1,  7,  999, FLAT, MONS_IRON_DEVIL },
+  {  1,  7,  260, DOWN, MONS_FLYING_SKULL },
+  {  1,  7, 1000, FLAT, MONS_IRON_IMP },
+  {  1,  7, 1000, FLAT, MONS_IRON_DEVIL },
   {  1,  7,   81, PEAK, MONS_VAMPIRE },
   {  1,  7,  136, SEMI, MONS_FLAYED_GHOST },
-  {  1,  7,  476, SEMI, MONS_WRAITH },
+  {  1,  7,  475, SEMI, MONS_WRAITH },
   {  1,  7,  192, SEMI, MONS_FREEZING_WRAITH },
   {  1,  7,   25, PEAK, MONS_DANCING_WEAPON },
-  {  1,  7,  898, FLAT, MONS_REAPER },
+  {  1,  7,  900, FLAT, MONS_REAPER },
   {  1,  7,   25, PEAK, MONS_SOUL_EATER },
   {  1,  7,  192, FLAT, MONS_ICE_DEVIL },
-  {  1,  7,  334, FLAT, MONS_BLUE_DEVIL },
-  {  1,  7,  161, PEAK, MONS_PHANTASMAL_WARRIOR },
+  {  1,  7,  335, FLAT, MONS_BLUE_DEVIL },
+  {  1,  7,  160, PEAK, MONS_PHANTASMAL_WARRIOR },
   {  1,  7,   25, PEAK, MONS_LICH },
   {  2,  8,   25, PEAK, MONS_IRON_DRAGON },
   {  4,  7,    4, FLAT, MONS_BRIMSTONE_FIEND },
@@ -586,29 +586,29 @@ static const pop_entry pop_dis[] =
 static const pop_entry pop_geh[] =
 { // Gehenna
   {  1, 12,  690, DOWN, MONS_RED_DEVIL },
-  {  1,  7, 1998, FLAT, MONS_SKELETON },
-  {  1,  7, 1998, FLAT, MONS_ZOMBIE },
+  {  1,  7, 2000, FLAT, MONS_SKELETON },
+  {  1,  7, 2000, FLAT, MONS_ZOMBIE },
   {  1,  7,  350, FLAT, MONS_HELL_HOUND },
   {  1,  7,  192, FLAT, MONS_HELL_HOG },
   {  1,  7,   46, DOWN, MONS_FIRE_BAT },
   {  1,  7,   30, FLAT, MONS_IRON_GOLEM },
   {  1,  7,  192, DOWN, MONS_CRIMSON_IMP },
-  {  1,  7,  514, DOWN, MONS_NECROPHAGE },
-  {  1,  7,  217, DOWN, MONS_PHANTOM },
+  {  1,  7,  515, DOWN, MONS_NECROPHAGE },
+  {  1,  7,  215, DOWN, MONS_PHANTOM },
   {  1,  7,  705, DOWN, MONS_SHADOW },
   {  1,  7,  690, DOWN, MONS_WIGHT },
-  {  1,  7,  384, FLAT, MONS_FLYING_SKULL },
-  { -1,  7,  514, PEAK, MONS_HELL_KNIGHT },
+  {  1,  7,  385, FLAT, MONS_FLYING_SKULL },
+  { -1,  7,  515, PEAK, MONS_HELL_KNIGHT },
   { -1,  7,   89, PEAK, MONS_IRON_DEVIL },
-  { -1,  7,  402, SEMI, MONS_VAMPIRE },
-  { -1,  7,  571, FLAT, MONS_WRAITH },
+  { -1,  7,  400, SEMI, MONS_VAMPIRE },
+  { -1,  7,  570, FLAT, MONS_WRAITH },
   {  2,  6,    8, PEAK, MONS_FIRE_CRAB },
-  {  1,  7,  589, FLAT, MONS_HELLION },
-  {  1,  7,  367, FLAT, MONS_TORMENTOR },
+  {  1,  7,  590, FLAT, MONS_HELLION },
+  {  1,  7,  365, FLAT, MONS_TORMENTOR },
   {  1,  7,  192, FLAT, MONS_BALRUG },
-  {  2,  6,  217, FLAT, MONS_EFREET },
-  {  1,  7,  217, FLAT, MONS_FLAYED_GHOST },
-  {  1,  9,  384, SEMI, MONS_REAPER },
+  {  2,  6,  215, FLAT, MONS_EFREET },
+  {  1,  7,  215, FLAT, MONS_FLAYED_GHOST },
+  {  1,  9,  385, SEMI, MONS_REAPER },
   {  3,  7,    8, PEAK, MONS_SOUL_EATER },
   {  3,  7,   14, SEMI, MONS_HELL_SENTINEL },
   {  3,  7,    8, PEAK, MONS_BRIMSTONE_FIEND },
@@ -621,28 +621,28 @@ static const pop_entry pop_geh[] =
 static const pop_entry pop_coc[] =
 { // Cocytus
   {  1,  7,  136, DOWN, MONS_NECROPHAGE },
-  {  1,  7,  514, FLAT, MONS_SKELETAL_WARRIOR },
-  {  1,  7, 1914, FLAT, MONS_SKELETON },
-  {  1,  7, 1914, FLAT, MONS_ZOMBIE },
+  {  1,  7,  515, FLAT, MONS_SKELETAL_WARRIOR },
+  {  1,  7, 1915, FLAT, MONS_SKELETON },
+  {  1,  7, 1915, FLAT, MONS_ZOMBIE },
   {  1,  7,   70, DOWN, MONS_SIMULACRUM },
-  {  1,  7,  957, DOWN, MONS_ICE_BEAST },
-  {  1,  7,  889, SEMI, MONS_BLUE_DEVIL },
+  {  1,  7,  955, DOWN, MONS_ICE_BEAST },
+  {  1,  7,  890, SEMI, MONS_BLUE_DEVIL },
   {  1,  5,  136, DOWN, MONS_PHANTOM },
-  {  1,  6,  624, DOWN, MONS_SHADOW },
-  {  1,  7,  344, DOWN, MONS_VAMPIRE },
+  {  1,  6,  625, DOWN, MONS_SHADOW },
+  {  1,  7,  345, DOWN, MONS_VAMPIRE },
   {  1,  7,  420, DOWN, MONS_WIGHT },
-  {  1,  7,  641, SEMI, MONS_FLYING_SKULL },
-  { -1,  7,  258, SEMI, MONS_MUMMY },
+  {  1,  7,  640, SEMI, MONS_FLYING_SKULL },
+  { -1,  7,  260, SEMI, MONS_MUMMY },
   { -1,  7,  146, SEMI, MONS_HUNGRY_GHOST },
   { -1,  7,  420, SEMI, MONS_WRAITH },
-  {  1,  7,  968, FLAT, MONS_FREEZING_WRAITH },
+  {  1,  7,  970, FLAT, MONS_FREEZING_WRAITH },
   {  1,  7,   89, PEAK, MONS_PHANTASMAL_WARRIOR },
-  {  1,  7,  303, FLAT, MONS_ICE_DRAGON },
-  {  1,  7,  889, FLAT, MONS_WHITE_IMP },
-  {  1,  7,  287, FLAT, MONS_TORMENTOR },
-  {  1,  7,  889, FLAT, MONS_ICE_DEVIL },
+  {  1,  7,  305, FLAT, MONS_ICE_DRAGON },
+  {  1,  7,  890, FLAT, MONS_WHITE_IMP },
+  {  1,  7,  285, FLAT, MONS_TORMENTOR },
+  {  1,  7,  890, FLAT, MONS_ICE_DEVIL },
   {  1,  7,  192, FLAT, MONS_BLIZZARD_DEMON },
-  {  1,  7,  457, UP,   MONS_REAPER },
+  {  1,  7,  455, UP,   MONS_REAPER },
   {  1,  7,   81, PEAK, MONS_SOUL_EATER },
   {  2,  8,   35, PEAK, MONS_LICH },
   {  3,  7,    8, PEAK, MONS_ANCIENT_LICH },
@@ -652,38 +652,38 @@ static const pop_entry pop_coc[] =
 static const pop_entry pop_tar[] =
 { // Tartarus
   {  1,  7,   89, DOWN, MONS_CRIMSON_IMP },
-  {  1,  7,  999, FLAT, MONS_SHADOW_IMP },
+  {  1,  7, 1000, FLAT, MONS_SHADOW_IMP },
   {  1,  7,   40, PEAK, MONS_RED_DEVIL },
-  {  1,  7,  999, FLAT, MONS_SKELETAL_WARRIOR },
-  {  1,  7, 1998, FLAT, MONS_SKELETON },
+  {  1,  7, 1000, FLAT, MONS_SKELETAL_WARRIOR },
+  {  1,  7, 2000, FLAT, MONS_SKELETON },
   {  1,  7,   89, FLAT, MONS_DEATH_DRAKE },
   {  1,  7,   46, DOWN, MONS_HELL_KNIGHT },
-  {  1,  7,  849, SEMI, MONS_NECROPHAGE },
-  {  1,  7,  552, DOWN, MONS_PHANTOM },
-  {  1,  7,  837, DOWN, MONS_WIGHT },
-  {  1,  7, 1998, FLAT, MONS_ZOMBIE },
-  {  1,  7,  552, DOWN, MONS_HELL_HOUND },
+  {  1,  7,  850, SEMI, MONS_NECROPHAGE },
+  {  1,  7,  550, DOWN, MONS_PHANTOM },
+  {  1,  7,  835, DOWN, MONS_WIGHT },
+  {  1,  7, 2000, FLAT, MONS_ZOMBIE },
+  {  1,  7,  550, DOWN, MONS_HELL_HOUND },
   {  1,  7,   35, PEAK, MONS_NECROMANCER },
-  {  1,  7,  988, FLAT, MONS_SHADOW },
-  {  1,  7,  552, SEMI, MONS_WRAITH },
+  {  1,  7,  990, FLAT, MONS_SHADOW },
+  {  1,  7,  550, SEMI, MONS_WRAITH },
   {  1,  7,  690, SEMI, MONS_FREEZING_WRAITH },
-  {  1,  7,  258, FLAT, MONS_SILENT_SPECTRE },
-  {  1,  7,  367, FLAT, MONS_TORMENTOR },
-  {  1,  7,  244, SEMI, MONS_ICE_DEVIL },
-  {  1,  7,  217, SEMI, MONS_BLUE_DEVIL },
+  {  1,  7,  260, FLAT, MONS_SILENT_SPECTRE },
+  {  1,  7,  365, FLAT, MONS_TORMENTOR },
+  {  1,  7,  245, SEMI, MONS_ICE_DEVIL },
+  {  1,  7,  215, SEMI, MONS_BLUE_DEVIL },
   {  1,  7,  230, SEMI, MONS_GHOST_CRAB },
-  {  1,  7,  217, FLAT, MONS_HUNGRY_GHOST },
+  {  1,  7,  215, FLAT, MONS_HUNGRY_GHOST },
   {  1,  7,  192, FLAT, MONS_FLAYED_GHOST },
   {  1,  7,  420, FLAT, MONS_PHANTASMAL_WARRIOR },
   {  1,  7,   70, PEAK, MONS_SIMULACRUM },
   {  1,  7,   89, SEMI, MONS_SHADOW_DRAGON },
   {  1,  7,  720, FLAT, MONS_NECROPHAGE },
-  {  1,  7,  367, FLAT, MONS_HELLION },
-  {  1,  7,  859, FLAT, MONS_REAPER },
-  {  1,  7,  367, FLAT, MONS_SHADOW_DEMON },
-  {  1,  7,  402, FLAT, MONS_VAMPIRE },
-  {  1,  7,  571, FLAT, MONS_FLYING_SKULL },
-  {  1,  9,  258, SEMI, MONS_SOUL_EATER },
+  {  1,  7,  365, FLAT, MONS_HELLION },
+  {  1,  7,  860, FLAT, MONS_REAPER },
+  {  1,  7,  365, FLAT, MONS_SHADOW_DEMON },
+  {  1,  7,  400, FLAT, MONS_VAMPIRE },
+  {  1,  7,  570, FLAT, MONS_FLYING_SKULL },
+  {  1,  9,  260, SEMI, MONS_SOUL_EATER },
   {  1,  9,  125, PEAK, MONS_LICH },
   {  3,  7,   11, PEAK, MONS_ANCIENT_LICH },
   { 0,0,0,FLAT,MONS_0 }
@@ -693,7 +693,7 @@ static const pop_entry pop_zot[] =
 { // Zot
   {  1,  5,   89, DOWN, MONS_ELECTRIC_GOLEM },
   {  1,  5,   42, FLAT, MONS_ORB_OF_FIRE },
-  {  1,  5,  972, FLAT, MONS_MOTH_OF_WRATH },
+  {  1,  5,  970, FLAT, MONS_MOTH_OF_WRATH },
   {  1,  5,   73, FLAT, MONS_BLACK_DRACONIAN },
   {  1,  5,   73, FLAT, MONS_MOTTLED_DRACONIAN },
   {  1,  5,   73, FLAT, MONS_YELLOW_DRACONIAN },
@@ -710,16 +710,16 @@ static const pop_entry pop_zot[] =
   {  1,  5,   59, FLAT, MONS_DRACONIAN_ANNIHILATOR },
   {  1,  5,   59, FLAT, MONS_DRACONIAN_KNIGHT },
   {  1,  5,   59, FLAT, MONS_DRACONIAN_SCORCHER },
-  {  1,  5,  514, FLAT, MONS_TENTACLED_MONSTROSITY },
-  {  1,  5,  334, FLAT, MONS_FIRE_DRAGON },
-  {  1,  5,  334, FLAT, MONS_ICE_DRAGON },
-  {  1,  5,  334, FLAT, MONS_DEATH_COB },
+  {  1,  5,  515, FLAT, MONS_TENTACLED_MONSTROSITY },
+  {  1,  5,  335, FLAT, MONS_FIRE_DRAGON },
+  {  1,  5,  335, FLAT, MONS_ICE_DRAGON },
+  {  1,  5,  335, FLAT, MONS_DEATH_COB },
   {  1,  5,  192, UP,   MONS_SHADOW_DRAGON },
-  { -4,  5,  514, UP,   MONS_STORM_DRAGON },
+  { -4,  5,  515, UP,   MONS_STORM_DRAGON },
   {  1,  5,  192, UP,   MONS_GHOST_MOTH },
   {  2,  8,   52, SEMI, MONS_KILLER_KLOWN },
   {  1,  5,  150, UP,   MONS_CURSE_TOE },
-  {  1, 11,  367, SEMI, MONS_GOLDEN_DRAGON },
+  {  1, 11,  365, SEMI, MONS_GOLDEN_DRAGON },
   { 0,0,0,FLAT,MONS_0 }
 };
 #if TAG_MAJOR_VERSION == 34
@@ -760,13 +760,13 @@ static const pop_entry pop_abyss[] =
   { -1,  6, 1500, DOWN, MONS_ABOMINATION_SMALL },
   {  1,  5, 1000, FLAT, MONS_ABOMINATION_LARGE },
   {  1, 10,   16, SEMI, MONS_TENTACLED_MONSTROSITY },
-  {  1,  5,  334, FLAT, MONS_WRETCHED_STAR },
-  {  1,  5,  334, FLAT, MONS_TENTACLED_STARSPAWN },
-  {  1,  5,  334, FLAT, MONS_ANCIENT_ZYME },
-  {  1,  5,  334, FLAT, MONS_STARCURSED_MASS },
-  {  1,  5,  334, FLAT, MONS_THRASHING_HORROR },
+  {  1,  5,  335, FLAT, MONS_WRETCHED_STAR },
+  {  1,  5,  335, FLAT, MONS_TENTACLED_STARSPAWN },
+  {  1,  5,  335, FLAT, MONS_ANCIENT_ZYME },
+  {  1,  5,  335, FLAT, MONS_STARCURSED_MASS },
+  {  1,  5,  335, FLAT, MONS_THRASHING_HORROR },
   {  1,  5,   89, FLAT, MONS_LURKING_HORROR },
-  {  1, 10,  178, SEMI, MONS_SPATIAL_MAELSTROM },
+  {  1, 10,  180, SEMI, MONS_SPATIAL_MAELSTROM },
   {  1,  5,   89, FLAT, MONS_APOCALYPSE_CRAB },
   {  1,  5,  300, FLAT, MONS_RAIJU },
   {  1,  8,  165, DOWN, MONS_WORLDBINDER },
@@ -903,7 +903,7 @@ static const pop_entry pop_pan[] =
   {  1,  1,    4, FLAT, MONS_GOLDEN_EYE },
   {  1,  1,  192, FLAT, MONS_DEMONIC_CRAWLER },
   {  1,  1,    8, FLAT, MONS_TOENAIL_GOLEM },
-  {  1,  1,  668, FLAT, MONS_RED_DEVIL },
+  {  1,  1,  670, FLAT, MONS_RED_DEVIL },
   {  1,  1, 1000, FLAT, MONS_HELLWING },
   {  1,  1, 1000, FLAT, MONS_SIXFIRHY },
   {  1,  1,  900, FLAT, MONS_NEQOXEC },
@@ -911,26 +911,26 @@ static const pop_entry pop_pan[] =
   {  1,  1,  900, FLAT, MONS_SMOKE_DEMON },
   {  1,  1, 1000, FLAT, MONS_YNOXINUL },
   {  1,  1,  192, FLAT, MONS_CHAOS_SPAWN },
-  {  1,  1,  334, FLAT, MONS_LOROCYPROCA },
-  {  1,  1,  334, FLAT, MONS_TORMENTOR },
-  {  1,  1,  334, FLAT, MONS_REAPER },
-  {  1,  1,  334, FLAT, MONS_SOUL_EATER },
-  {  1,  1,  334, FLAT, MONS_ICE_DEVIL },
-  {  1,  1,  334, FLAT, MONS_BLUE_DEVIL },
-  {  1,  1,  334, FLAT, MONS_HELL_BEAST },
-  {  1,  1,  334, FLAT, MONS_IRON_DEVIL },
+  {  1,  1,  335, FLAT, MONS_LOROCYPROCA },
+  {  1,  1,  335, FLAT, MONS_TORMENTOR },
+  {  1,  1,  335, FLAT, MONS_REAPER },
+  {  1,  1,  335, FLAT, MONS_SOUL_EATER },
+  {  1,  1,  335, FLAT, MONS_ICE_DEVIL },
+  {  1,  1,  335, FLAT, MONS_BLUE_DEVIL },
+  {  1,  1,  335, FLAT, MONS_HELL_BEAST },
+  {  1,  1,  335, FLAT, MONS_IRON_DEVIL },
   {  1,  1, 1000, FLAT, MONS_EXECUTIONER },
   {  1,  1, 1000, FLAT, MONS_GREEN_DEATH },
   {  1,  1, 1000, FLAT, MONS_BLIZZARD_DEMON },
   {  1,  1, 1000, FLAT, MONS_BALRUG },
   {  1,  1, 1000, FLAT, MONS_CACODEMON },
-  {  1,  1,  334, FLAT, MONS_BRIMSTONE_FIEND },
-  {  1,  1,  334, FLAT, MONS_ICE_FIEND },
-  {  1,  1,  334, FLAT, MONS_SHADOW_FIEND },
-  {  1,  1,  334, FLAT, MONS_HELL_SENTINEL },
-  {  1,  1,  334, FLAT, MONS_SUN_DEMON },
-  {  1,  1,  334, FLAT, MONS_SHADOW_DEMON },
-  {  1,  1,  334, FLAT, MONS_HELLION },
+  {  1,  1,  335, FLAT, MONS_BRIMSTONE_FIEND },
+  {  1,  1,  335, FLAT, MONS_ICE_FIEND },
+  {  1,  1,  335, FLAT, MONS_SHADOW_FIEND },
+  {  1,  1,  335, FLAT, MONS_HELL_SENTINEL },
+  {  1,  1,  335, FLAT, MONS_SUN_DEMON },
+  {  1,  1,  335, FLAT, MONS_SHADOW_DEMON },
+  {  1,  1,  335, FLAT, MONS_HELLION },
   {  1,  1,   89, FLAT, MONS_EFREET },
   {  1,  1,   89, FLAT, MONS_RAKSHASA },
   {  1,  1, 1000, FLAT, MONS_ABOMINATION_LARGE },
@@ -971,30 +971,30 @@ static const pop_entry pop_trove[] =
 static const pop_entry pop_sewer[] =
 { // Sewer
   {  1,  1, 1000, FLAT, MONS_GIANT_NEWT },
-  {  1,  1,  514, FLAT, MONS_GIANT_GECKO },
+  {  1,  1,  515, FLAT, MONS_GIANT_GECKO },
   {  1,  1, 1000, FLAT, MONS_BAT },
-  {  1,  1,  514, FLAT, MONS_BALL_PYTHON },
-  {  1,  1,  514, FLAT, MONS_ADDER },
-  {  1,  1,  514, FLAT, MONS_WORM },
-  {  1,  1,  514, FLAT, MONS_OOZE },
-  {  1,  1,  514, FLAT, MONS_GIANT_COCKROACH },
-  {  1,  1,  514, FLAT, MONS_GIANT_MITE },
+  {  1,  1,  515, FLAT, MONS_BALL_PYTHON },
+  {  1,  1,  515, FLAT, MONS_ADDER },
+  {  1,  1,  515, FLAT, MONS_WORM },
+  {  1,  1,  515, FLAT, MONS_OOZE },
+  {  1,  1,  515, FLAT, MONS_GIANT_COCKROACH },
+  {  1,  1,  515, FLAT, MONS_GIANT_MITE },
   { 0,0,0,FLAT,MONS_0 }
 };
 
 static const pop_entry pop_ossuary[] =
 { // Ossuary
   {  1,  1,   89, FLAT, MONS_MUMMY },
-  {  1,  1,  514, FLAT, MONS_SKELETON },
-  {  1,  1,  514, FLAT, MONS_ZOMBIE },
+  {  1,  1,  515, FLAT, MONS_SKELETON },
+  {  1,  1,  515, FLAT, MONS_ZOMBIE },
   { 0,0,0,FLAT,MONS_0 }
 };
 
 static const pop_entry pop_bailey[] =
 { // Bailey
-  {  1,  1,  514, FLAT, MONS_GNOLL },
-  {  1,  1,  514, FLAT, MONS_ORC },
-  {  1,  1,  258, FLAT, MONS_ORC_WARRIOR },
+  {  1,  1,  515, FLAT, MONS_GNOLL },
+  {  1,  1,  515, FLAT, MONS_ORC },
+  {  1,  1,  260, FLAT, MONS_ORC_WARRIOR },
   {  1,  1,   25, FLAT, MONS_ORC_KNIGHT },
   { 0,0,0,FLAT,MONS_0 }
 };
@@ -1003,28 +1003,28 @@ static const pop_entry pop_icecv[] =
 { // Ice Cave
   {  1,  1,   89, FLAT, MONS_YAK },
   {  1,  1,   89, FLAT, MONS_POLAR_BEAR },
-  {  1,  1,  514, FLAT, MONS_ICE_BEAST },
-  {  1,  1,  514, FLAT, MONS_WHITE_IMP },
-  {  1,  1,  514, FLAT, MONS_ICE_DEVIL },
+  {  1,  1,  515, FLAT, MONS_ICE_BEAST },
+  {  1,  1,  515, FLAT, MONS_WHITE_IMP },
+  {  1,  1,  515, FLAT, MONS_ICE_DEVIL },
   {  1,  1,   25, FLAT, MONS_BLUE_DEVIL },
-  {  1,  1,  258, FLAT, MONS_FREEZING_WRAITH },
-  {  1,  1, 1028, FLAT, MONS_SIMULACRUM },
+  {  1,  1,  260, FLAT, MONS_FREEZING_WRAITH },
+  {  1,  1, 1030, FLAT, MONS_SIMULACRUM },
   { 0,0,0,FLAT,MONS_0 }
 };
 
 static const pop_entry pop_volcano[] =
 { // Volcano
-  {  1,  1,  514, FLAT, MONS_HELL_HOUND },
-  {  1,  1,  386, FLAT, MONS_HELL_HOG },
-  {  1,  1,  514, FLAT, MONS_MANTICORE },
-  {  1,  1,  514, FLAT, MONS_LINDWURM },
-  {  1,  1,  514, FLAT, MONS_FIRE_DRAKE },
-  {  1,  1,  386, FLAT, MONS_TOENAIL_GOLEM },
-  {  1,  1,  514, FLAT, MONS_FIRE_ELEMENTAL },
-  {  1,  1,  386, FLAT, MONS_GARGOYLE },
-  {  1,  1,  386, FLAT, MONS_RED_DEVIL },
-  {  1,  1,  514, FLAT, MONS_EFREET },
-  {  1,  1,  514, FLAT, MONS_SALAMANDER },
+  {  1,  1,  515, FLAT, MONS_HELL_HOUND },
+  {  1,  1,  385, FLAT, MONS_HELL_HOG },
+  {  1,  1,  515, FLAT, MONS_MANTICORE },
+  {  1,  1,  515, FLAT, MONS_LINDWURM },
+  {  1,  1,  515, FLAT, MONS_FIRE_DRAKE },
+  {  1,  1,  385, FLAT, MONS_TOENAIL_GOLEM },
+  {  1,  1,  515, FLAT, MONS_FIRE_ELEMENTAL },
+  {  1,  1,  385, FLAT, MONS_GARGOYLE },
+  {  1,  1,  385, FLAT, MONS_RED_DEVIL },
+  {  1,  1,  515, FLAT, MONS_EFREET },
+  {  1,  1,  515, FLAT, MONS_SALAMANDER },
   { 0,0,0,FLAT,MONS_0 }
 };
 
@@ -1313,7 +1313,7 @@ static const pop_entry pop_water_hell[] =
   {  1,  7,   120, FLAT, MONS_ALLIGATOR },
   {  1,  7,   130, FLAT, MONS_ANACONDA },
   {  1,  7,   230, FLAT, MONS_HYDRA },
-  {  1,  7,   113, FLAT, MONS_WATER_ELEMENTAL },
+  {  1,  7,   115, FLAT, MONS_WATER_ELEMENTAL },
   {  1,  7,    37, FLAT, MONS_KRAKEN },
   { 0,0,0,FLAT,MONS_0 }
 };