Merge branch 'mon-pick'

The behaviour should be preserved exactly or almost exactly, only the code
changes from totally, utterly unreadable to merely hard to read.

Actual differences:
* strong OODs in shallow branches would degenerate into picking a monster
  randomly from the whole branch, now they pick from the bottom level (or
  so-called OOD cap of Elf:7, Tomb:5, D:31 and Vaults:15).
* Zot no longer replaces requests for Zot:5 by Zot:4, and proper hells,
  $(HELL):4-7 by $(HELL):3.
  * this means hell monster sets need fixing!
* zombie size doesn't affect their spawning
* zombie selection obeys the depth passed
  * which makes zombie sets pretty limited -- needs review/redesign?

The new format is:
{  9, 19,  826, SEMI, MONS_YAK },
which means: yaks can spawn on D:9-19, with _linear_ rarity 826 in the
middle of the range.  A "SEMI" distribution means that at the edges,
D:9 and D:19, the effective rarity is half that, 413.

Distributions:
FLAT   100% 100% 100%
SEMI    50% 100%  50%
PEAK     0% 100%   0%
UP       0%  50% 100%
DOWN   100%  50%   0%

That "0%" doesn't mean the monster won't spawn on the top/bottom level
(D:9 and D:19 for yaks), the range is fudged so D:8 receives 0% chance,
D:9 16.6%, linearly up to 100% on D:14.

Yes, this sounds and is complex, but at least the complexity is not strewn
around obscure code anymore, and a number of limitations have been lifted.

ZotDef still uses the old code via an emulation layer.

1 files changed, 0 insertions, 13 deletions

diff --git a/crawl-ref/source/mgen_enum.h b/crawl-ref/source/mgen_enum.h
index 95bebfdcf2..45c355c121 100644
--- a/crawl-ref/source/mgen_enum.h
+++ b/crawl-ref/source/mgen_enum.h
@@ -82,19 +82,6 @@ enum band_type
     NUM_BANDS                   // always last
 };
 
-enum demon_class_type
-{
-    DEMON_LESSER,                      //    0: Class V
-    DEMON_COMMON,                      //    1: Class II-IV
-    DEMON_GREATER,                     //    2: Class I
-    DEMON_RANDOM,                      //    any of the above
-};
-
-enum holy_being_class_type
-{
-    HOLY_BEING_WARRIOR,                //    0: daeva or angel
-};
-
 enum dragon_class_type
 {
     DRAGON_LIZARD,