New Zot levels, courtesy Lemuel (David).

Added more control when specifying draconians in maps (any yellow draconian, green draconian knight, any nonbase red draconian, any base draconian, etc.).

Fixed crash when dragon or draconian breathes and the player is unarmed.

Replaced magic number 250 in monster creation with enum constant MONS_PROGRAM_BUG.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3253 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 356 insertions, 42 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 201498f361..2df4110cb1 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -1596,7 +1596,7 @@ ENDMAP
 # the snail
 
 NAME: david_023_snail
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 MAP
          xxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index 8f09b7547b..aa76801766 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -1,9 +1,10 @@
 ##############################################################################
-# hells.des: vestibule entries, vestibule, all hell end levels
+# hells.des: vestibule entries, vestibule,
+#            hell vaults, hell end levels
 ##############################################################################
 
 ##############################################################################
-# Hell-themed random maps
+# Vestibule entries
 ##############################################################################
 
 default-depth: D:12-26
@@ -108,9 +109,101 @@ MAP
 ..................??..........
 ENDMAP
 
-#############################################################################
+
+##############################################################################
+# Hell vaults
+##############################################################################
+
+##############################################################################
+# lemuel_hellion_isle
+ 
+NAME: lemuel_hellion_isle
+DEPTH: Geh:*
+MONS: hellion, Fiend
+SUBST: L = l.
+SUBST: 1 = .:2 l:2 1
+MAP
+      lL
+     llL
+    LlLLL
+   LLllLL
+llLLLlllLLL
+LllllllllllLL
+LLLlll11lllllLL
+ LLLll111llllL
+  LLlll121llLL
+  Lllll111lLL
+  LLllll1llL
+   LllllllL
+   LLLlllL
+    LLllL
+     LlL
+     LlL
+ENDMAP
+
+##############################################################################
+# lemuel_mystery_crypt
+
+NAME:   lemuel_mystery_crypt
+DEPTH:  Dis:*
+MONS:   mummy / mummy priest / greater mummy, lich
+NSUBST: 1:1=} / *=1
+NSUBST: 1:1=) / *=1
+NSUBST: 1:1=] / *=1
+SUBST:  = : =+
+SUBST:  }=}>, )=)>, ]=]>
+# occasionally (12.5%), all downstairs are in this vault
+ORIENT: float
+MAP
+xxxxxxxxxxxxxxxxxxxxxxx
+xxFxxxx1.x1x.1xxx2..=1x
+xx.xxxxx.x.x.xxxx...xxx
+xx.xx1.x.x.x.x.1x...=1x
+xx.xxx=x=x=x=x=xx...xxx
+x...+...........+...=1x
++...+.....F.....+.F.xxx
+x...+...........+...=1x
+xx.xxx=x=x=x=x=xx...xxx
+xx.xx1.x.x.x.x.1x...=1x
+xx.xxxxx.x.x.xxxx...xxx
+xxFxxxx1.x1x.1xxx2..=1x
+xxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+##############################################################################
+# lemuel_nasty_pond
+
+NAME:   lemuel_nasty_pond
+DEPTH:  Tar:*
+TAGS:   no_pool_fixup
+FLAGS:  no_rotate
+MONS:   plant, oklob plant, death ooze, rotting devil, blue death / green death
+SUBST:  W:w.
+SUBST:  Z:w.
+SUBST:  w = w .:1
+SUBST:  . = .:15 1:1 w:1
+SUBST:  1 = 1 2:2
+COLOUR: . = none / green w:2
+COLOUR: w = green / lightgreen
+MAP
+     ...WWWW3....
+   .3..WWWWW....3...
+ ....WWWwwW...3....3.
+..Z.WWwwwwww3.....3...
+3.ZZWwwwwwwwwww3......
+.ZZZ..wwwww5wwwwww3...
+..3Z..44wwwwwww33.....
+.3ZZZ..44wwwwww3..3...
+.ZZZZZ.44wwwww........
+ ..ZZZZZ4wwww.3......
+   3ZZZZwwwww....3.
+     .ZZwww3.....
+ENDMAP
+
+##############################################################################
 # Vestibule of Hell and Geryon
-#
+##############################################################################
+
 NAME: vestibule_of_hell
 PLACE: Hell
 ORIENT: encompass
@@ -119,9 +212,7 @@ MARKER: G=feat:enter_gehenna
 MARKER: C=feat:enter_cocytus
 MARKER: T=feat:enter_tartarus
 SUBST: D=A, G=A, C=A, T=A
-
 MONS: Geryon
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -150,21 +241,21 @@ xxxxxxxxxxxxx.....................................................xxxxxxxxxxxxxx
 xxxxxxxxxxxx.......................................................xxxxxxxxxxxxx
 xxxxxxxxxxxx.......................................................xxxxxxxxxxxxx
 xxxxxxxxxxx.........................................................xxxxxxxxxxxx
-xxxxxxxxxxx............................{............................xxxxxxxxxxxx
-xxxxxxxxxxx.........................................................xxxxxxxxxxxx
-xxxxxxxxxx...l.l.....................................................xxxxxxxxxxx
-xxxxxxxxxx..l.l.l.l..................................................xxxxxxxxxxx
-xxxxxxxxxx.l.l.l.l.l.................................................xxxxxxxxxxx
-xxxxxxxxx.l.l.l.l.l...................................................xxxxxxxxxx
-xxxxxxxxxl.l.l.l.l.l..................................................xxxxxxxxxx
-xxxxxxxxx.l.l.l.G.l.l.................}1].............................=Txxxxxxxx
-xxxxxxxxxl.l.l.l.l.l.l.................)..............................xxxxxxxxxx
-xxxxxxxxx.l.l.l.l.l.l.................................................xxxxxxxxxx
-xxxxxxxxxx.l.l.l.l.l.l...............................................xxxxxxxxxxx
-xxxxxxxxxx..l.l.l.l..................................................xxxxxxxxxxx
-xxxxxxxxxx.....l.l...................................................xxxxxxxxxxx
-xxxxxxxxxxx......................[...........(......................xxxxxxxxxxxx
-xxxxxxxxxxx.........................................................xxxxxxxxxxxx
+xxxxxxxxxxx............................{......................cccc..xxxxxxxxxxxx
+xxxxxxxxxxx...................................................ccccccccxxxxxxxxxx
+xxxxxxxxxx...l.l..............................................cccc...cxxxxxxxxxx
+xxxxxxxxxx..l.l.l.l.............................................c....cxxxxxxxxxx
+xxxxxxxxxx.l.l.l.l.l............................................c....cxxxxxxxxxx
+xxxxxxxxx.l.l.l.l.l.............................................c...ccccxxxxxxxx
+xxxxxxxxxl.l.l.l.l.l............................................+...c..ccxxxxxxx
+xxxxxxxxx.l.l.l.G.l.l.................}1].......................+...+.T.cxxxxxxx
+xxxxxxxxxl.l.l.l.l.l.l.................)........................+...c..ccxxxxxxx
+xxxxxxxxx.l.l.l.l.l.l...........................................c...ccccxxxxxxxx
+xxxxxxxxxx.l.l.l.l.l.l..........................................c....cxxxxxxxxxx
+xxxxxxxxxx..l.l.l.l.............................................c....cxxxxxxxxxx
+xxxxxxxxxx.....l.l............................................cccc...cxxxxxxxxxx
+xxxxxxxxxxx......................[...........(................ccccccccxxxxxxxxxx
+xxxxxxxxxxx...................................................cccc..xxxxxxxxxxxx
 xxxxxxxxxxx.........................................................xxxxxxxxxxxx
 xxxxxxxxxxxx.......................................................xxxxxxxxxxxxx
 xxxxxxxxxxxx.......................................................xxxxxxxxxxxxx
@@ -195,15 +286,17 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-#############################################################################
+
+##############################################################################
 # Dispater's castle - rest of level filled up with plan_4 (irregular city)
-#
+##############################################################################
 
 NAME: castle_dis
 PLACE: Dis:7
 TAGS: dis
 ORIENT: north
-
+MONS: Dispater, Fiend, Ice Fiend, iron devil, metal gargoyle
+MONS: random, random
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -243,17 +336,16 @@ xxxxxxxxv..vvvvvvvvv........................................vvvvvvvvv..vxxxxxxxx
 xxxxxxxxv............................{.[.(.............................vxxxxxxxx
 ENDMAP
 
-MONS: Dispater, Fiend, Ice Fiend, iron devil, metal gargoyle
-MONS: random, random
 
-#############################################################################
-# Asmodeus 
-#
+##############################################################################
+# Asmodeus
+##############################################################################
 
 NAME: asmodeus
 PLACE: Geh:7
 ORIENT: encompass
-
+MONS: Asmodeus, Fiend, Balrug, molten gargoyle
+MONS: Serpent of Hell, random, random
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -327,12 +419,10 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-MONS: Asmodeus, Fiend, Balrug, molten gargoyle
-MONS: Serpent of Hell, random, random
 
-############################################################################
+##############################################################################
 # Antaeus; bottom of Cocytus. David's Improved Demon Lairs, episode I.
-#
+##############################################################################
 # To do: this level has much shorter distances to travel, hence should
 #        come up with harder resistance.
 
@@ -345,7 +435,6 @@ SHUFFLE: O1d / e0% / f9* / g8|
 KMONS:   d = ice devil w:5 / Ice Fiend / nothing w:5
 KITEM:   d = any
 SUBST:   ' = w .
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -421,6 +510,7 @@ ENDMAP
 
 ##############################################################################
 # Old Antaeus level
+##############################################################################
 
 NAME:    antaeus_in_days_of_yore
 PLACE:   Coc:7
@@ -428,7 +518,6 @@ ORIENT:  encompass
 SHUFFLE: $|, 2X
 SUBST:   X=., 3=3.
 MONS: Antaeus, Ice Fiend, ice dragon, Ice Fiend
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -505,14 +594,13 @@ ENDMAP
 
 ##############################################################################
 # Ereshkigal (Tartarus)
-#
+##############################################################################
 
 NAME: ereshkigal
 PLACE: Tar:7
 ORIENT: encompass
 MONS: Ereshkigal, necrophage, wraith, shadow, small zombie
 MONS: small skeleton, Shadow Fiend
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -585,6 +673,3 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
-
-
-
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 9622f587f8..e4bdbc4f1c 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -961,6 +961,7 @@ ENDMAP
 NAME:    swamp_alternative
 PLACE:   Swamp:5
 TAGS:    no_pool_fixup
+FLAGS:   no_rotate
 ORIENT:  float
 MONS:    swamp dragon, swamp drake, hydra, firedrake
 ITEM:    nothing
diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des
index d832d224a2..f82becdc53 100644
--- a/crawl-ref/source/dat/zot.des
+++ b/crawl-ref/source/dat/zot.des
@@ -3,6 +3,234 @@
 #          should be serious challenges! Players dying on Zot:5 are okay :)
 ##############################################################################
 
+
+###########################
+#
+# Zot petite vaults
+#
+
+NAME:   lemuel_baited_zot_trap
+DEPTH:  Zot:*
+CHANCE: 20
+TAGS:   allow_dup
+KFEAT:  * = Zot trap
+KITEM:  * = any good_item
+MAP
+*
+ENDMAP
+
+NAME:  lemuel_zot_downstairs
+DEPTH: Zot:1-4
+ORIENT: float
+TAGS:  allow_dup
+SUBST: . = .^
+KFEAT: ^ = Zot trap
+SUBST: > = }])
+MAP
+xxxxxxx
+@....>x
+xxxxxxx
+ENDMAP
+
+NAME:  lemuel_zot_upstairs
+DEPTH: Zot:2-5
+ORIENT: float
+TAGS:  allow_dup 
+SUBST: . = .^
+KFEAT: ^ = zot trap
+SUBST: < = ([{
+MAP
+xxxxxxx
+@....<x
+xxxxxxx
+ENDMAP
+
+
+###########################
+# Halls of Wrath
+#
+NAME:   lemuel_halls_of_wrath
+DEPTH:  Zot:1-4
+ORIENT: float
+FLAGS:  no_rotate
+NSUBST: 1 = 6:2 / *=1
+SUBST:  1 = 1 .:5
+SUBST:  1 = 1 3
+MONS:   troll/deep troll/iron troll/ogre/two-headed ogre/w:2 iron devil
+MONS:   moth of wrath
+MONS:   hill giant/stone giant/fire giant/frost giant/ettin/w:5 efreet/w:3 titan
+NSUBST: C = 2:= / *=c
+NSUBST: D = 2:= / *=c
+MAP
+cccccccccccccccccccccccc
+n111111111111111111.c..c
+n111111111111111111.c.)c
+cCCCCCCCCCCCCCCcc++cc..c
+n....F....F....F....c..c
++...................+..c
++...................+.}c
++...................+..c
+n....F....F....F....c..c
+cDDDDDDDDDDDDDDcc++cc..c
+n111111111111111111.c.]c
+n111111111111111111.c..c
+cccccccccccccccccccccccc
+ENDMAP
+
+###########################
+# Lich library
+#
+NAME:   lemuel_lich_library
+DEPTH:  Zot:1-4
+TAGS:   no_monster_gen
+MONS:   flying skull, lich, ancient lich, necromancer, vampire mage, mimic
+ITEM:   any book, any scroll
+SUBST:  w:w?
+SUBST:  ?=. 1:1
+SUBST:  x:xc
+SUBST:  +=+=
+SUBST:  d = d 6:1
+SUBST:  4 = 4 5:2 .:4
+SUBST:  d = d:20 e
+MAP
+wwwwwwwwwwwwwwwwwwwwwww
+wwwwwwwwwwwwwwwwwwwwwww
+wwxxxxxxxxx+xxxxxxxxxww
+wwx....x.......x....xww
+wwx....+...F...+....xww
+wwx.4..x.......x..4.xww
+wwx4.4.xxxx+xxxx.4.4xww
+wwx.4.4xxx...xxx4.4.xww
+wwx4.4.xxx.2.xxx.4.4xww
+wwxxxxxxxxx+xxxxxxx+xww
+wwxxxxxxxxx.xxxxxx$$xww
+wwxdddxxxxx.x...xx$$xww
+wwx.2.xxxxx.+.F.xxxxxww
+wwx...xxxxx.x...xxxxxww
+wwx...xxxxx.xxxxxxxxxww
+wwxx+xxxxxx.xxxdddddxww
+wwxx.xxxxxx.xxxd232dxww
+wwxx.xxxxxx.xxxd...dxww
+wwxx......+...+....dxww
+wwxxxxxxxxxmxxxd...dxww
+wwxxxxxxxxxFxxxdddddxww
+wwxxxxxxxxxxxxxxxxxxxww
+wwwwwwwwwwwwwwwwwwwwwww
+wwwwwwwwwwwwwwwwwwwwwww
+ENDMAP
+
+###########################
+# Lake of fire
+#
+NAME:  lemuel_lake_of_fire
+DEPTH: Zot:*
+SUBST: * =*l
+KMONS: * = orb of fire
+KFEAT: * = l
+SUBST: .=.l
+MAP
+ ..ll..
+..llll..
+.llllll.
+.ll**ll.
+.ll**ll.
+.llllll.
+..llll..
+ ..ll..
+ENDMAP
+
+###########################
+#
+# Globe of electric golems
+#
+NAME:  lemuel_golem_globe
+DEPTH: Zot:*
+FLAGS: no_rotate
+SUBST: 1 = 1.
+MONS:  electric golem
+MAP
+  mmmm
+ mm..mm
+mm.11.mm
+m.1..1.m
+mm.11.mm
+ mm..mm
+  mmmm
+ENDMAP
+
+###########################
+# Acid trip
+#
+NAME:   lemuel_acid_trip
+DEPTH:  Zot:1-4
+ORIENT: float
+MONS:   oklob plant, acid blob, jelly, yellow draconian
+MONS:   any nonbase yellow draconian
+SUBST:  1 = 1:2 .
+SUBST:  . = .:20 3:3 2:1
+SUBST:  }=}>, )=)>, ]=]>
+# chance for having all downstairs in the vault is 12.5%
+MAP
+       xx++xx
+     xxx....xxx
+   xxx..4444..xxx
+  xx....4554....xx
+ xx.....cccc.....xx
+ x....ccc..ccc....x
+xx...cc......cc...xx
+x...cc..1111..cc...x
+x...c...1}11...c...x
+x.5.c...11]1...c.5.x
+x...c...1)11...c...x
+x...cc..1111..cc...x
+xx...cc......cc...xx
+ x....cc....cc....x
+ xx....c....c....xx
+  xx............xx
+   xxx..4444..xxx
+     xxx4554xxx
+       xxxxxx
+ENDMAP
+
+###########################
+# Firehouse
+#
+NAME:   lemuel_firehouse
+DEPTH:  Zot: 1-4
+ORIENT: float
+MONS:   orb of fire
+MONS:   fire elemental
+MONS:   red draconian / weight:2 mottled draconian
+MONS:   any nonbase red draconian
+MONS:   efreet
+SUBST:  1=122, 3=322
+SUBST:  4 = 2:20 4:5 3:15 .:20
+MAP
+          lllll
+       lllllllllll
+     lllll.....lllll
+    llll....x....llll
+   llll....xxx....llll
+   llll...xx}xx...llll
+  llll...xx]2)xx...llll
+  llll..xx2...2xx..llll
+ llll..xx...5...xx..llll
+ llll..x...2.2...x..llll
+llll...x.2xx+xx2.x...llll
+llll...x.xx444xx.x...llll
+llll...x.x44444x.x...llll
+ llll..x.x44F44x.x..llll
+ llll..x.x44444x.x..llll
+  llll.x.xx444xx.x.llll
+  llll.x.1x...x1.x.llll
+   llllxxxx+++xxxxllll
+    llll333...333llll
+     lllll.....lllll
+       lllllllllll
+          ll>ll
+ENDMAP
+
+
 ##############################################################################
 # hall_of_Zot