Some D population adjustments

This is largely to try and slightly spice up the still-awkward
post-Lair section of D. The presence of some generic enemies drops
off more quickly than before, others also appear earlier, where
they might be more impactful, and a few things are added or made
much less rare in the late D range. (Also, some crimson imp weight
has been offloaded onto shadow imps, which seem like a reasonable
monster that never spawns anywhere they might do something - and
are likely better than crimson imps anyway).

1 files changed, 20 insertions, 17 deletions

diff --git a/crawl-ref/source/mon-pick-data.h b/crawl-ref/source/mon-pick-data.h
index de512235da..85cbd64281 100644
--- a/crawl-ref/source/mon-pick-data.h
+++ b/crawl-ref/source/mon-pick-data.h
@@ -29,7 +29,8 @@ static const pop_entry pop_d[] =
   {  4, 14,  334, SEMI, MONS_PHANTOM },
   {  4, 16,  999, FLAT, MONS_SKELETON },
   {  5, 13,   89, PEAK, MONS_GNOLL_SERGEANT },
-  {  5, 15,  999, FLAT, MONS_CRIMSON_IMP },
+  {  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 },
@@ -38,68 +39,70 @@ static const pop_entry pop_d[] =
   {  5, 15,  192, PEAK, MONS_QUASIT },
   {  5, 15,  192, PEAK, MONS_WATER_MOCCASIN },
   {  5, 16,  999, FLAT, MONS_ZOMBIE },
-  {  6, 13,  220, SEMI, MONS_BLACK_BEAR },
+  {  6, 13,  285, SEMI, MONS_BLACK_BEAR },
   {  6, 16,  999, FLAT, MONS_GIANT_FROG },
   {  6, 16,  826, SEMI, MONS_ORC_WARRIOR },
   {  6, 16,  514, SEMI, MONS_GOLIATH_BEETLE },
   {  6, 16,  334, SEMI, MONS_GIANT_SPORE },
   {  6, 16,  334, 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,  514, SEMI, MONS_KILLER_BEE },
   {  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,  230, PEAK, MONS_EYE_OF_DRAINING },
+  {  9, 14,  826, 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,  826, SEMI, MONS_YAK },
-  {  9, 17,  514, SEMI, MONS_BIG_KOBOLD },
-  {  9, 17,  334, SEMI, MONS_GARGOYLE },
   { 10, 16,  194, PEAK, MONS_SOLDIER_ANT },
   { 10, 18,  999, FLAT, MONS_HILL_GIANT },
   { 10, 18,  334, SEMI, MONS_WRAITH },
   { 10, 18,  220, PEAK, MONS_TRAPDOOR_SPIDER },
   { 10, 20,  514, 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,  350, SEMI, MONS_SHADOW },
+  { 11, 21,  380, SEMI, MONS_SHADOW },
   { 11, 21,  334, SEMI, MONS_MOTTLED_DRAGON },
   { 11, 21,  258, 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 },
-  { 12, 20,  420, SEMI, MONS_MANTICORE },
   { 12, 22,  879, SEMI, MONS_SLIME_CREATURE },
   { 12, 22,  192, PEAK, MONS_VAMPIRE },
-  { 13, 18,  999, FLAT, MONS_UGLY_THING },
   { 13, 21,   89, PEAK, MONS_RAKSHASA },
   { 13, 17,  923, FLAT, MONS_CENTAUR_WARRIOR },
   { 18, 23,  923, DOWN, MONS_CENTAUR_WARRIOR },
-  { 13, 19,  334, SEMI, MONS_TENGU_WARRIOR },
-  { 13, 19,  136, SEMI, MONS_TENGU_CONJURER },
+  { 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, 27,   89, DOWN, MONS_CATOBLEPAS },
-  { 14, 19,   89, FLAT, MONS_WIZARD },
+  { 14, 19,  140, FLAT, MONS_WIZARD },
   { 14, 20,   52, SEMI, MONS_BLINK_FROG },
+  { 14, 20,  136, SEMI, MONS_DEEP_ELF_FIGHTER },
+  { 14, 22,  258, SEMI, MONS_FREEZING_WRAITH },
   { 14, 22,  272, SEMI, MONS_SIMULACRUM },
-  { 14, 22,  136, SEMI, MONS_BOGGART },
+  { 14, 22,  115, SEMI, MONS_BOGGART },
   { 14, 27,  192, PEAK, MONS_FIRE_DRAGON },
   { 15, 20,  334, 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,  277, PEAK, MONS_GIANT_SLUG },
-  { 16, 20,  136, SEMI, MONS_DEEP_ELF_FIGHTER },
-  { 16, 22,   89, PEAK, MONS_KOBOLD_DEMONOLOGIST },
-  { 16, 24,  258, PEAK, MONS_FREEZING_WRAITH },
   { 16, 24,   89, PEAK, MONS_REDBACK },
   { 16, 24,   66, PEAK, MONS_BORING_BEETLE },
   { 16, 24,   25, PEAK, MONS_SHADOW_WRAITH },
-  { 16, 26,  345, DOWN, MONS_ORC_KNIGHT },
   { 16, 27,   92, PEAK, MONS_ICE_DRAGON },
   { 17, 23,   89, PEAK, MONS_VERY_UGLY_THING },
   { 17, 24,  244, PEAK, MONS_BOULDER_BEETLE },