Map and help cleanup (dpeg).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3384 c06c8d41-db1a-0410-9941-cceddc491573
author: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> 2008-02-02 16:05:59 +0000
committer: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> 2008-02-02 16:05:59 +0000
commit: 37a4ac33578a9a8e9366ce1e0686dbea42dc66b8 (patch)
tree: cac13e20e8d54c1c1289e3eb9b5119e3343d4ce8
parent: 8190b0f9eafb99e6e8d8d510bcf3264dcc5ff71d (diff)
download: crawl-ref-37a4ac33578a9a8e9366ce1e0686dbea42dc66b8.tar.gz
crawl-ref-37a4ac33578a9a8e9366ce1e0686dbea42dc66b8.zip
16 files changed, 778 insertions, 813 deletions
diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index 440960e7b6..4ba53b32e7 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -14,8 +14,8 @@
 # I    Temples (Multi-altar vaults)
 ######################################
 
-NAME: minitemple
-TAGS: allow_dup
+NAME:   minitemple
+TAGS:   allow_dup
 # More common than the others.
 CHANCE: 20
 MAP
@@ -29,10 +29,10 @@ cBcBcBcBcc
 cccccccccc
 ENDMAP
 
-NAME: jmf_multi_god_temple
+NAME:    jmf_multi_god_temple
 SHUFFLE: abc
-SUBST: a:=, b:x, c:x
-DEPTH: 8-
+SUBST:   a:=, b:x, c:x
+DEPTH:   D:8-21, Vault
 MAP
 ............
 .axxxxxxxxa.
@@ -48,8 +48,8 @@ MAP
 ............
 ENDMAP
 
-NAME: jmf_multi_god_temple2
-DEPTH: 12-
+NAME:  jmf_multi_god_temple2
+DEPTH: D:8-21, Vault
 MAP
 ............
 ..vvvvvvvv..
@@ -87,19 +87,20 @@ MAP
 ...........
 ENDMAP
 
-NAME: lemuel_round_altar
-TAGS: allow_dup
+NAME:    lemuel_round_altar
+TAGS:    allow_dup
 SHUFFLE: cvxx
+SUBST:   X:x.
 MAP
-   xxxxx
+   xxXxx
   xx...xx
  xx.....xx
  x.......x
- x...C...@
+ X...C...@
  x.......x
  xx.....xx
   xx...xx
-   xxxxx
+   xxXxx
 ENDMAP
 
 NAME: lemuel_crystal_altar
@@ -110,16 +111,15 @@ b.b
 b.b
 ENDMAP
 
-NAME: lemuel_altar_in_water
-DEPTH: D:2-18, !Lair, !Hive, !Slime
+NAME:   lemuel_altar_in_water
+DEPTH:  D:2-18, Swamp, Shoal
 CHANCE: 9
-FLAGS: no_rotate
 : local brnd = crawl.random2(13)
 : if brnd > 10 then
-TAGS: no_monster_gen
+TAGS: no_monster_gen no_rotate
 # this case almost always has altar access
 : else
-TAGS: no_monster_gen no_pool_fixup
+TAGS: no_monster_gen no_pool_fixup no_rotate
 : end
 MAP
    .........   
@@ -135,10 +135,9 @@ MAP
    ........  
 ENDMAP
 
-NAME: lemuel_altar_in_water2
-TAGS: no_pool_fixup no_monster_gen
-DEPTH: 2-18
-FLAGS: no_rotate
+NAME:   lemuel_altar_in_water2
+TAGS:   no_pool_fixup no_monster_gen
+DEPTH:  D:2-18, Lair, Snake, Swamp, Shoal
 CHANCE: 1
 MAP
    www
@@ -150,20 +149,20 @@ MAP
    www
 ENDMAP
 
-NAME: lemuel_oklob_altar
-DEPTH: 6-18
-MONS: oklob plant, plant
+NAME:  lemuel_oklob_altar
+DEPTH: D:6-18, Lair, Snake, Shoal
+MONS:  oklob plant, plant
 MAP
  2
 2C1
  2
 ENDMAP
 
-NAME: lemuel_hidden_altar
-DEPTH: 1-18, !Lair, !Orc, !Hive, !Slime
+NAME:    lemuel_hidden_altar
+DEPTH:   D:1-18, Vault, Lair, Elf, Crypt
 SHUFFLE: XY
-SUBST: X = .
-SUBST: Y = =
+SUBST:   X = .
+SUBST:   Y = =
 MAP
 .........
 .xxxXxxx.
@@ -176,9 +175,9 @@ MAP
 .........
 ENDMAP
 
-NAME: lemuel_sealed_altar_a
+NAME:   lemuel_sealed_altar_a
 CHANCE: 3
-DEPTH: 2-18, !Lair, !Orc, !Hive, !Slime
+DEPTH:  D:2-18, Vault, Elf, Crypt
 MAP
 xxxxxxxxxxxxx
 x...........x
@@ -196,7 +195,7 @@ ENDMAP
 
 NAME: lemuel_sealed_altar_b
 CHANCE: 7
-DEPTH: 2-18, !Lair, !Orc, !Hive, !Slime
+DEPTH: D:2-18, Vault, Elf, Crypt
 MAP
 xxxxxxxxxxx
 x.........x
@@ -208,8 +207,9 @@ x.........x
 xxxxxxxxxxx
 ENDMAP
 
-NAME: lemuel_tele_altar
-DEPTH: 2-18, !Lair, !Orc, !Hive, !Slime
+NAME:  lemuel_tele_altar
+DEPTH: D:2-18, Vault 
+SUBST: Y = X x
 KFEAT: X = teleport trap
 MAP
 .............
@@ -217,36 +217,30 @@ MAP
 .x.........x.
 .x.........x.
 .x.........x.
-.X....C....X.
+.Y....C....Y.
 .x.........x.
 .x.........x.
 .x.........x.
-.xxxxxXxxxxx.
+.xxxxxYxxxxx.
 .............
 ENDMAP
 
-NAME: lemuel_statue_altar
-
-# Increased depth from 2-18 because getting a hostile statue can
-# instakill a low-level character.
-
-DEPTH: 10-18, !Lair, !Hive, !Slime
-
+NAME:  lemuel_statue_altar
+DEPTH: 2-18, Vault, Elf
+: if you.absdepth() < 10 then
+SUBST: F = G
+: end
 MAP
-.....
-.cFc.
-.c.c.
-.c.c.
-.c.c.
-.c>c.
-.cCc.
-.ccc.
-.....
+.........
+.ccccccc.
+.F...>Cc.
+.ccccccc.
+.........
 ENDMAP
 
-NAME: lemuel_coloured_pillars_altar
-DEPTH: 2-18, !Lair, !Hive, !Slime, !Orc
-FLAGS: no_rotate
+NAME:   lemuel_coloured_pillars_altar
+DEPTH:  D:2-18, Vault, Elf
+TAGS:   no_rotate
 COLOUR: c = blue / yellow / red / cyan
 MAP
 xxxxxxxxxxxxxxxxxxxx
@@ -258,38 +252,27 @@ c...c...c...c...c..x
 xxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-NAME: lemuel_upstairs_altar
-DEPTH: 2-12, !Lair, !Hive, !Slime, !Orc
+NAME:   lemuel_upstairs_altar
+DEPTH:  D:2-12, Vault, Elf, Crypt
 ORIENT: float
-SUBST: T:T.
-SUBST: ) = )}]
+SUBST:  T:T., )=)}], c:ccx
 MAP
 ccccccc
 cT...Tc
-c.....c
-c..C..c
-c.....c
+c.....ccccccc
+c..C..+....)c
+c.....ccccccc
 cT...Tc
-ccc+ccc
-  c.c
-  c.c
-  c.c
-  c.c
-  c)c
-  ccc
+ccccccc
 ENDMAP
 
 ######################################
 # III  Special altars
 ######################################
 
-NAME: lemuel_angel_altar
-
-# Moved deeper since being teleported next to the Angel will be a
-# quick death at shallow levels.
-
-DEPTH: 9-18, !Lair, !Orc, !Hive, !Slime
-MONS: angel
+NAME:  lemuel_angel_altar
+DEPTH: D:3-18, Vault
+MONS:  angel/daeva
 KFEAT: C = altar_elyvilon / altar_zin / altar_shining_one
 MAP
    .....
@@ -305,9 +288,9 @@ MAP
    .....
 ENDMAP
 
-NAME: lemuel_hellish_altar
-DEPTH: 2-18, !Lair, !Hive, !Slime
-MONS: iron devil/orange demon, beast/rotting devil, lemure/manes, hellion
+NAME:  lemuel_hellish_altar
+DEPTH: D:2-21, Crypt, Geh
+MONS:  iron devil/orange demon, beast/rotting devil, lemure/manes, hellion
 SUBST: 2 = 23
 SUBST: 2 = 12
 SUBST: 3 = 3L
@@ -319,25 +302,24 @@ SUBST: C = C / P:1
 KFEAT: C = altar_lugonu/altar_yredelemnul/altar_kikubaaqudgha/altar_makhleb
 KFEAT: P = enter_abyss
 MAP
-....LLllLL.....
-...LllllllLLL..
+  ..LLllLL.... 
+  .LllllllLLL..
 ..Lll323lllLLL.
 .LLl32123lllLL.
 .LLl33C33llLL..
 ..Lll323llLL...
 ..LLll3llL.....
-...LLlllL......
-....LLLL.......
-.....LLLLL.....
-.......LLLL....
+...LLlllL...   
+....LLLL....   
+   ..LLLLL..   
+   ....LLLL.   
 ENDMAP
 
-NAME:    david_defended_altar
-DEPTH:   D:7-20, Orc, Elf, Snake
-SHUFFLE: 1ID/2TC
-TAGS:    allow_dup
-MONS:    orc priest, deep elf priest / w:30 nothing
-KFEAT:   D = altar_beogh / w:2 altar_okawaru / w:2 altar_makhleb
+NAME:  david_defended_altar_orc
+DEPTH: D:7-20, Orc
+MONS:  orc priest
+TAGS:  uniq_defended_altar
+KFEAT: D = altar_beogh / w:1 altar_okawaru / w:1 altar_makhleb / w:1 altar_trog
 MAP
 ccccc...
 c1..c...
@@ -346,11 +328,23 @@ c1..c...
 ccccc...
 ENDMAP
 
-NAME: lemuel_blue_sif_altar
-DEPTH: 2-18, !Lair, !Hive, !Slime, !Orc
-TAGS: no_monster_gen mini_float
+NAME:  david_defended_altar_elf
+DEPTH: D:7-20, Elf
+MONS:  deep elf priest / w:30 nothing
+TAGS:  uniq_defended_altar
+MAP
+ccccc...
+c1..c...
+c1C.+.G@
+c1..c...
+ccccc...
+ENDMAP
+
+NAME:   lemuel_blue_sif_altar
+DEPTH:  D:2-18, Elf, Vault
+TAGS:   no_monster_gen mini_float
 COLOUR: . = blue
-KFEAT: C = altar_sif_muna
+KFEAT:  C = altar_sif_muna
 MAP
 xxxxxxxxxxxxxx
 ...........xxx
@@ -359,9 +353,9 @@ xxxxxxxxxxxxxx
 xxxxxxxxxxxxxx
 ENDMAP
 
-NAME: lemuel_dead_fish_altar
-DEPTH: 2-18, !Hive, !Slime, !Orc
-TAGS: no_pool_fixup
+NAME:  lemuel_dead_fish_altar
+DEPTH: D:2-18, Crypt
+TAGS:  no_pool_fixup
 KMONS: 1 = giant goldfish zombie / big fish zombie / nothing
 KFEAT: 1 = deep_water
 KFEAT: C = altar_kikubaaqudgha / altar_yredelemnul
@@ -377,10 +371,10 @@ ENDMAP
 
 # The mix of deep and shallow water is intended to keep the centaurs from 
 # escaping without requiring the player to be able to cross deep water.
-NAME: lemuel_centaur_altar
-DEPTH: 7-20, Shoal
-TAGS: no_pool_fixup no_monster_gen
-MONS: centaur
+NAME:  lemuel_centaur_altar
+DEPTH: D:7-20, Shoal, Lair
+TAGS:  no_pool_fixup no_monster_gen
+MONS:  centaur
 MAP
 xxxxxxxxxxxxx
 xxxxxxxxxxwxx
@@ -394,15 +388,15 @@ xxxwwwWwWxxxx
 xxx......xxxx
 ENDMAP
 
-NAME: lemuel_mausoleum_altar
-DEPTH: 7-20, Crypt
-MONS: w:50 human zombie/orc zombie/elf zombie/w:5 ogre zombie/w:5 troll zombie
-MONS: w:50 human skeleton/orc skeleton/elf skeleton/w:5 ogre skeleton/w:5 troll skeleton
-MONS: mummy, wight, wraith, necrophage, ghoul
+NAME:   lemuel_mausoleum_altar
+DEPTH:  D:7-20, Crypt
+MONS:   w:50 human zombie/orc zombie/elf zombie/w:5 ogre zombie/w:5 troll zombie
+MONS:   w:50 human skeleton/orc skeleton/elf skeleton/w:5 ogre skeleton/w:5 troll skeleton
+MONS:   mummy, wight, wraith, necrophage, ghoul
 NSUBST: ? = 1:C / *:1
-SUBST: 1 = 1:25 2 3 4:8 5:6 6:4 7:2
-KFEAT: C = altar_kikubaaqudgha / altar_yredelemnul
-KMONS: C = human zombie
+SUBST:  1 = 1:25 2 3 4:8 5:6 6:4 7:2
+KFEAT:  C = altar_kikubaaqudgha / altar_yredelemnul
+KMONS:  C = human zombie
 MAP
 ccccccc
 c?+.+?c
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index e35f5c6d23..ab69e27345 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -2,6 +2,15 @@
 # bazaar.des - Bazaar entry vaults and bazaar layouts.
 ###############################################################################
 
+# To do: 
+# 1) Ideally, the portal duration should depend on absolute depth (the deeper,
+#    the less time the player gets). I suggest a duration of
+#    100 + 10*(30-abs.depth) + rn(100*(30-abs.depth))
+# 2) I think there should be more bazaars: each shop should have a chance of
+#    (abs.depth-10)/30 of becoming a portal (with negative chance==0), and at
+#    most one bazaar per level
+# 3) The above would (and should) include bazaars outside of the dungeon.
+
 ###############################################################################
 # Bazaar entries
 
@@ -164,9 +173,8 @@ ENDMAP
 #########################################
 # Portal by the lakeside (jpeg)
 NAME:    bzr_entry_007
-TAGS:    bzr_entry allow_dup
+TAGS:    bzr_entry allow_dup no_rotate
 ORIENT:  float
-FLAGS:   no_rotate
 MONS:    plant
 SHUFFLE: XY
 SUBST:   a = W .
@@ -203,8 +211,7 @@ ENDMAP
 # General marketplace
 # 4 random shops
 NAME:   bazaar_general_marketplace
-TAGS:   bazaar allow_dup
-FLAGS:  no_rotate
+TAGS:   bazaar allow_dup no_rotate
 ORIENT: encompass
 KFEAT:  A = any shop
 : bazaar_message(_G)
@@ -256,9 +263,8 @@ ENDMAP
 # Another simple one (jpeg)
 # 4 random shops
 NAME:    bazaar_oval
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-FLAGS:   no_rotate
 SUBST:   A = TVBG
 KFEAT:   B = any shop
 : bazaar_message(_G)
@@ -313,8 +319,7 @@ ENDMAP
 # Wands
 # 2 wand shops, 2 jewellery shops
 NAME:    bazaar_wands
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 KFEAT:   A = wand shop
 KFEAT:   B = distillery shop
@@ -361,8 +366,7 @@ ENDMAP
 # bazaars in a row
 # ~4 shops
 NAME:    bazaar_row
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff
 SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss
@@ -406,8 +410,7 @@ ENDMAP
 # bazaars in a row v2
 # ~4.5 shops
 NAME:    bazaar_row_2
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: Aa/Bb/Cc/Dd/Ee/Ff/Gg/Hh
 SHUFFLE: Aa/Zz, Bb/Yy, Cc/Rr, Dd/Ss, Ee/Jj, Ff/Kk, Gg/Mm
@@ -450,8 +453,7 @@ ENDMAP
 # 5 shops
 NAME:    bazaar_circle_1
 CHANCE:  2
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD, EFGH
 SUBST:   H=>, A=T, B=T
@@ -491,8 +493,7 @@ ENDMAP
 
 NAME:    bazaar_circle_2
 CHANCE:  2
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: EFGH
 SUBST:   H=>, D=T, C=T
@@ -532,8 +533,7 @@ ENDMAP
 
 NAME:    bazaar_circle_3
 CHANCE:  2
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: EFGH
 SUBST:   A=>, D=T, C=T
@@ -573,8 +573,7 @@ ENDMAP
 
 NAME:    bazaar_circle_4
 CHANCE:  1
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCDEF
 KFEAT:   A = any shop
@@ -613,8 +612,7 @@ ENDMAP
 
 NAME:    bazaar_circle_5
 CHANCE:  2
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 KFEAT:   C = any shop
 KFEAT:   D = any shop
@@ -652,8 +650,7 @@ ENDMAP
 
 NAME:    bazaar_circle_6
 CHANCE:  1
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 KFEAT:   A = any shop / antique armour shop
 KFEAT:   B = any shop / antique weapon shop
@@ -692,9 +689,8 @@ ENDMAP
 # bazaar in honeycomb form (jpeg)
 # 4 shops
 NAME:    bazaar_honeycomb
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-FLAGS:   no_rotate
 MONS:    plant
 SHUFFLE: ABCDEF
 SUBST:   A = >, B = >
@@ -733,9 +729,8 @@ ENDMAP
 # bazaar lakeside with goldfish (jpeg)
 # 5 shops
 NAME:    bazaar_lake
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-FLAGS:   no_rotate
 MONS:    giant goldfish
 SUBST:   a = W.
 SHUFFLE: ABCDEF
@@ -800,9 +795,8 @@ ENDMAP
 # Bazaars in cross form (jpeg)
 # 2.25 shops
 NAME:    bazaar_cross1
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  5
-FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD
 SUBST:   A = <, B = >
@@ -832,9 +826,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_cross2
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  5
-FLAGS:   no_rotate
 ORIENT:  encompass
 SHUFFLE: ABCD
 SUBST:   A = T E, B = >
@@ -868,8 +861,7 @@ ENDMAP
 # strange pattern (jpeg) 
 # 4 shops
 NAME:    bazaar_ribbon
-TAGS:    bazaar allow_dup
-FLAGS:   no_rotate
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 SHUFFLE: zZ
 SUBST:   z = ., Z = w
@@ -916,9 +908,8 @@ ENDMAP
 # Nine rooms (jpeg)
 # 5 shops
 NAME:    bazaar_ninerooms1
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  2
-FLAGS:   no_rotate
 ORIENT:  encompass
 SUBST:   k : . x
 NSUBST:  A = 2=T:30 V / *:C
@@ -954,9 +945,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms2
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  2
-FLAGS:   no_rotate
 ORIENT:  encompass
 SUBST:   k : . x
 NSUBST:  A = 2=T:30 V / *:C
@@ -992,9 +982,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms3
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  2
-FLAGS:   no_rotate
 ORIENT:  encompass
 SUBST:   z = .:50 +
 SUBST:   k : . x
@@ -1031,9 +1020,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms4
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  2
-FLAGS:   no_rotate
 ORIENT:  encompass
 SUBST:   z = .:50 +
 SUBST:   k : . x
@@ -1070,9 +1058,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_ninerooms5
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 CHANCE:  2
-FLAGS:   no_rotate
 ORIENT:  encompass
 SUBST:   k : . x
 NSUBST:  A = 1:< / 1:> / 1:T C / 3=T:30 V / *:C
@@ -1111,10 +1098,9 @@ ENDMAP
 # some more bazaars based on triangles (jpeg)
 # 4.4 shops
 NAME:    bazaar_triangles
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 CHANCE:  1
-FLAGS:   no_rotate
 SHUFFLE: ACD
 SUBST:   A = <
 KFEAT:   B = any shop / antique armour shop / jewellery shop
@@ -1134,10 +1120,9 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_hexagon
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
 CHANCE:  4
-FLAGS:   no_rotate
 SHUFFLE: AC, BD
 KFEAT:   A = armour shop / weapon shop / wand shop
 KFEAT:   B = general shop / food shop
@@ -1165,9 +1150,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME:    bazaar_triangle_bulge
-TAGS:    bazaar allow_dup
+TAGS:    bazaar allow_dup no_rotate
 ORIENT:  encompass
-FLAGS:   no_rotate
 CHANCE:  5
 SHUFFLE: ABC
 SUBST:   A = <, B = >
diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des
index a8d0f6a816..116d4df6c5 100644
--- a/crawl-ref/source/dat/crypt.des
+++ b/crawl-ref/source/dat/crypt.des
@@ -7,7 +7,6 @@
 
 ########################
 # Dead fish
-# As of 0.3.2 the fish zombies can't move, they're basically just decorative
 NAME: lemuel_dead_fish_pool
 DEPTH: Crypt:*
 # Lemuel also had Cocytus:*
@@ -495,6 +494,10 @@ ENDMAP
 #
 NAME:    tomb_1
 PLACE:   Tomb:1
+
+# The whole branch starts off with teleport control prevention.
+BFLAGS:  no_tele_control
+
 ORIENT:  encompass
 #
 SHUFFLE: ([{, AB), ]}, FIJKL/fijkl, _-
@@ -704,7 +707,7 @@ ENDMAP
 NAME:    tomb_3
 PLACE:   Tomb:3
 ORIENT:  encompass
-FLAGS:   no_rotate
+TAGS:    no_rotate
 #
 SUBST:   ' : " $ ':80
 SUBST:   ' = " $
@@ -713,6 +716,9 @@ SUBST:   $ = *:2 |:1 $:17
 #
 MONS:    mummy, guardian mummy, mummy priest, greater mummy
 #
+MARKER:  O = lua:item_pickup_change_flags { \
+            branch_flags="!no_tele_control", item="golden rune" \
+         }
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index 36c7eb89f4..62055d070d 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -96,7 +96,8 @@ ENDMAP
 NAME:    elf_hall
 PLACE:   Elf:7
 ORIENT:  northwest
-FLAGS:   no_rotate
+TAGS:    no_rotate
+LFLAGS:  no_tele_control
 MONS:    deep elf high priest, deep elf demonologist, deep elf annihilator
 MONS:    deep elf sorcerer, deep elf death mage
 MONS:    deep elf blademaster, deep elf master archer
@@ -113,6 +114,10 @@ SUBST:   v : xvb
 SUBST:   | = | *:2 
 SUBST:   $ = $:20 *:4 |:1
 SUBST:   * = * |:3
+MARKER:  U = lua:feat_change_change_flags { \
+            level_flags="!no_tele_control", final_feat="dry_fountain", \
+            group="fountain" \
+         }
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -158,8 +163,8 @@ ENDMAP
 
 NAME:    elf_hall_gauntlet_wide
 PLACE:   Elf:7
-TAGS:    no_pool_fixup
-FLAGS:   no_rotate
+TAGS:    no_pool_fixup no_rotate
+LFLAGS:  no_tele_control
 ORIENT:  float
 CHANCE:  5
 MONS:    deep elf high priest, deep elf demonologist
@@ -179,6 +184,10 @@ KMONS:   A = deep elf master archer
 KFEAT:   A = |
 KMONS:   B = deep elf blademaster
 KFEAT:   B = |
+MARKER:  U = lua:feat_change_change_flags { \
+            level_flags="!no_tele_control", final_feat="dry_fountain", \
+            group="fountain" \
+         }
 MAP
 cccccccccccccccccccccccccc
 c2ccccccc........ccccccccc
@@ -209,8 +218,7 @@ ENDMAP
 
 NAME:    elf_hall_gauntlet_narrow
 PLACE:   Elf:7
-FLAGS:   no_rotate
-TAGS:    no_pool_fixup
+TAGS:    no_pool_fixup no_rotate
 ORIENT:  float
 CHANCE:  5
 MONS:    deep elf high priest, deep elf demonologist
@@ -237,6 +245,11 @@ KITEM:   6 = |
 KITEM:   7 = |
 KFEAT:   6 = 6
 KFEAT:   7 = 7
+LFLAGS:  no_tele_control
+MARKER:  U = lua:feat_change_change_flags { \
+            level_flags="!no_tele_control", final_feat="dry_fountain", \
+            group="fountain" \
+         }
 MAP
 ccccccccccccccccccccccccc
 c2ccccccc.......ccccccccc
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 2df4110cb1..8c8da3a89e 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -68,8 +68,7 @@ ENDMAP
 ##############################################################################
 
 NAME: entry_zaba_1
-TAGS: entry no_monster_gen no_item_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_item_gen no_rotate
 ORIENT: float
 SUBST: T = TV, ? = wW
 MAP
@@ -134,10 +133,9 @@ ENDMAP
 ##############################################################################
 
 NAME: lemuel_entry_001
-TAGS: entry
+TAGS: entry no_rotate
 ORIENT: float
 SUBST: !:cvxGT
-FLAGS: no_rotate
 MAP
      x.@.x
      x.!.x
@@ -561,8 +559,7 @@ ENDMAP
 ##############################################################################
 
 NAME: david_entry_001_a
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 CHANCE: 5
 SHUFFLE: {[(
@@ -588,8 +585,7 @@ xx.......xx.xx.......xx
 ENDMAP
 
 NAME: david_entry_001_b
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 CHANCE: 5
 SHUFFLE: {[
@@ -622,8 +618,7 @@ ENDMAP
 # Three discs
 
 NAME: david_entry_002
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 SUBST: ' = .x
 MAP
@@ -650,8 +645,7 @@ ENDMAP
 # Oval
 
 NAME: david_entry_003
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 SHUFFLE: {[(<, @X, Aa/Bb/Dd/Ee
 SUBST: A==, a=., B=c, b=c, D=c, d=c, E=c, e=c
@@ -680,8 +674,7 @@ ENDMAP
 # Water temple mockup
 
 NAME: david_entry_004_temple
-TAGS: entry no_monster_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 SHUFFLE: {[(, cxxx
 MAP
@@ -704,8 +697,7 @@ ENDMAP
 # Stone temple mockup
 
 NAME: david_entry_005_temple
-TAGS: entry no_monster_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 SHUFFLE: {[(, cxxx
 MAP
@@ -730,8 +722,7 @@ ENDMAP
 # Lava temple mockup
 
 NAME: david_entry_006_temple
-TAGS: entry no_monster_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 SHUFFLE: {[(, cxxx
 MAP
@@ -755,8 +746,7 @@ ENDMAP
 # Twelve chambers mockup
 
 NAME: david_entry_007_temple
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 SHUFFLE: {[(, cxxx
 MAP
@@ -785,9 +775,8 @@ ENDMAP
 # Three leaves mockup
 
 NAME: david_entry_008_temple
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
-FLAGS: no_rotate
 SHUFFLE: {[, cxxx
 MAP
    ccccccccccccccccc
@@ -863,9 +852,8 @@ ENDMAP
 # Circular labyrinths
 
 NAME: david_entry_011_a
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 CHANCE: 3
-FLAGS: no_rotate
 ORIENT: float
 MAP
           xxxxxxxx.@.xx
@@ -894,9 +882,8 @@ xx...xx....xxx.....xxx....xx...xx
 ENDMAP
 
 NAME: david_entry_011_b
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 CHANCE: 1
-FLAGS: no_rotate
 ORIENT: float
 MAP
           xxxxxxxxxxxxx
@@ -925,9 +912,8 @@ xx...xx....xxx.....xxx....xx...xx
 ENDMAP
 
 NAME: david_entry_011_c
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 CHANCE: 6
-FLAGS: no_rotate
 ORIENT: float
 SHUFFLE: ab, cd, ef, gh, ij, kl, mn
 SUBST: a=., c=., e=., g=., i=., k=., m=.
@@ -1012,9 +998,8 @@ ENDMAP
 # Cavernosity
 
 NAME: david_entry_014
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
-FLAGS: no_rotate
 MONS: fungus
 SHUFFLE: {[(, b:xxxbcv, UVW, XYZ
 SUBST: '=.x, U==, V=x, W=x, X==, Y=x, Z=x
@@ -1053,8 +1038,7 @@ ENDMAP
 # This is another series of entry levels, ten total. Leave the template intact
 # (but commented out). All water is deep.
 # NAME: water_fire_template
-# TAGS: entry no_monster_gen no_pool_fixup
-# FLAGS: no_rotate
+# TAGS: entry no_monster_gen no_pool_fixup no_rotate
 # CHANCE: 1
 # ORIENT: float
 # MONS: plant
@@ -1084,8 +1068,7 @@ ENDMAP
 # ENDMAP
 
 NAME: david_entry_015_a_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1115,8 +1098,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_b_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1146,8 +1128,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_c_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1177,8 +1158,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_d_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1208,8 +1188,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_e_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1239,8 +1218,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_f_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1270,8 +1248,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_g_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1301,8 +1278,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_h_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1332,8 +1308,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_i_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1363,8 +1338,7 @@ xx......xx+xxx+xx...x...xx+xxx+xx......xx
 ENDMAP
 
 NAME: david_entry_015_j_water_fire
-TAGS: entry no_monster_gen no_pool_fixup
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 CHANCE: 1
 MONS: plant
 ORIENT: float
@@ -1397,11 +1371,10 @@ ENDMAP
 # The Chase
 
 NAME: david_entry_016_chase
-TAGS: entry no_monster_gen no_pool_fixup
+TAGS: entry no_monster_gen no_pool_fixup no_rotate
 MONS: kobold, hobgoblin / goblin / giant bat
 ITEM: stone, dart
 ORIENT: float
-FLAGS: no_rotate 
 SUBST: w : w l:1
 MAP
 xxxxxxxxxxxxx..........@
@@ -1423,10 +1396,9 @@ ENDMAP
 # The humble fractal
 
 NAME: david_entry_017_a
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 CHANCE: 2
 ORIENT: float
-FLAGS: no_rotate
 SHUFFLE: {[(
 MAP
 xxxxxxxxxxxxxxxxxxxxxxx@x
@@ -1676,9 +1648,8 @@ ENDMAP
 # Concentric egg (David)
 
 NAME: david_026
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
-FLAGS: no_rotate
 MONS: worm / giant beetle, worm / giant beetle
 ITEM: nothing / ring of hunger / ring of protection from fire / ring of protection from cold
 ITEM: nothing / choko / pear / apple / sausage / banana / any scroll
@@ -1741,9 +1712,8 @@ ENDMAP
 # Sounds of Crawl: the Drone
 
 NAME: david_028_sounds_drone
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 MONS: generate_awake boring beetle
-FLAGS: no_rotate
 ORIENT: float
 SHUFFLE: {<
 MAP
@@ -2308,8 +2278,7 @@ ENDMAP
 # Sequences
 
 NAME: david_entry_044
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 SHUFFLE: {(
 MAP
@@ -2410,8 +2379,7 @@ ENDMAP
 # digital signposts
 
 NAME: david_entry_048_a
-TAGS: entry no_monster_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 CHANCE: 5
 SHUFFLE: cvba
@@ -2428,8 +2396,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 NAME: david_entry_048_b
-TAGS: entry no_monster_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 CHANCE: 5
 SHUFFLE: cvba
@@ -2598,9 +2565,8 @@ ENDMAP
 # Just another circle
 
 NAME: david_entry_055_a
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
-FLAGS: no_rotate
 CHANCE: 5
 SHUFFLE: lw
 MAP
@@ -2652,16 +2618,15 @@ ENDMAP
 # Stupid Stonehenge, eight and twelve columns
 
 NAME: david_entry_056_a
-TAGS: entry
+TAGS: entry no_rotate
 ORIENT: float
 CHANCE: 3
-FLAGS: no_rotate
 ITEM: nothing, nothing, nothing
 SHUFFLE: cccbvxxx, def}
 MAP
-..............................
-...............cc.............
-..d......cc....cc....cc....e..
+   ........................   
+   ............cc..........   
+  d......cc....cc....cc....e  
 .........cc..........cc.......
 ....cc........................
 ....cc...................cc...
@@ -2675,21 +2640,20 @@ MAP
 ...cc...................cc....
 ........................cc....
 .......cc..........cc.........
-..f....cc....cc....cc......}..
-.............cc...............
-.............................@
+  f....cc....cc....cc......}  
+   ..........cc............   
+   ........................   
 ENDMAP
 
 NAME: david_entry_056_b
-TAGS: entry
+TAGS: entry no_rotate
 ORIENT: float
 CHANCE: 7
-FLAGS: no_rotate
 SHUFFLE: cccbvxxx
 MAP
-..........................
-............cc............
-............cc............
+   ....................   
+   .........cc.........   
+   .........cc.........   
 .....cc............cc.....
 .....cc............cc.....
 ..........................
@@ -2700,9 +2664,9 @@ MAP
 ..........................
 .....cc............cc.....
 .....cc............cc.....
-............cc............
-............cc............
-.........................@
+   .........cc.........   
+   .........cc.........   
+   ....................   
 ENDMAP
 
 ##############################################################################
@@ -2882,18 +2846,18 @@ xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
-xxxxxx>lllllllllll....
-xxxxxxlClllllllll?...@
-xxxxxxlllllllll??.....
-xxxxxxllllllllll......
-xxxxxxllllllllll......
-xxxxxxllllllllll......
-xxxxxxlllllllll?......
-xxxxxxlllllllll.......
-xxxxxxllllllll?.......
-xxxxxxl?ll?ll?.....{..
-xxxxxxll.??...........
-xxxxxxl..............@
+xxxxxx>lllllllllll..  
+xxxxxxlClllllllll?..  
+xxxxxxlllllllll??...  
+xxxxxxllllllllll....  
+xxxxxxllllllllll....  
+xxxxxxllllllllll....  
+xxxxxxlllllllll?....  
+xxxxxxlllllllll.....  
+xxxxxxllllllll?.....  
+xxxxxxl?ll?ll?.....{  
+xxxxxxll.??....       
+xxxxxxl.........      
 ENDMAP
 
 NAME: david_entry_061_b_altar
@@ -2910,17 +2874,17 @@ xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxx>wwwwwwwwwwwwww.
-xxxxxxwCwwwwwwwwwww..@
-xxxxxxwwwwwwwwwwww....
-xxxxxxwwwwwwwwwwww....
-xxxxxxwwwwwwwwwww.....
-xxxxxxwwwwwwwwwww.....
-xxxxxxwwwwwwwwww......
-xxxxxxwwwwwwwwww......
-xxxxxxwwwwwwwww.......
-xxxxxxwwwwwwww.....{..
-xxxxxxwwwwww..........
-xxxxxxw..............@
+xxxxxxwCwwwwwwwwwww...
+xxxxxxwwwwwwwwwwww..  
+xxxxxxwwwwwwwwwwww..  
+xxxxxxwwwwwwwwwww...  
+xxxxxxwwwwwwwwwww...  
+xxxxxxwwwwwwwwww....  
+xxxxxxwwwwwwwwww....  
+xxxxxxwwwwwwwww.....  
+xxxxxxwwwwwwww.....{  
+xxxxxxwwwwww.....     
+xxxxxxw..........     
 ENDMAP
 
 ##############################################################################
@@ -3086,10 +3050,9 @@ ENDMAP
 # Just another castle
 
 NAME: david_entry_067
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ITEM: any, nothing, nothing
 ORIENT: float
-FLAGS: no_rotate
 SHUFFLE: ]def
 SUBST: c : cx
 
@@ -3097,8 +3060,8 @@ SUBST: c : cx
 # access to surroundings. This is intended and I like the low chance for this.
 
 MAP
-.............................
-.............................
+  .........................  
+  .........................  
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
@@ -3117,8 +3080,8 @@ MAP
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
-.............................
-............................@
+  .........................  
+  .........................  
 ENDMAP
 
 ##############################################################################
@@ -3155,13 +3118,13 @@ ORIENT: float
 CHANCE: 3
 SHUFFLE: bxxxx
 MAP
- .........@........ 
-..wwww........llll..
+ .......    ....... 
+..wwww...  ...llll..
 .w.wwww......llllll.
 .ww{}ww......llllll.
 .wwwwww......llllll.
 ..wwww..bbbb..llll..
-.......bbbbbb.......
+ ......bbbbbb...... 
       .bbbbbb.      
       .bbbbbb.      
       ..bbbb..      
@@ -3174,8 +3137,8 @@ ORIENT: float
 CHANCE: 3
 SHUFFLE: bxxxx
 MAP
- .......@.......... 
-..wwww........llll..
+ .......    ....... 
+..wwww...  ...llll..
 .wwwwww......llllll.
 .wwwwww......ll}{ll.
 .wwwwww......llll.l.
@@ -3193,8 +3156,8 @@ ORIENT: float
 CHANCE: 3
 SHUFFLE: bxxxx
 MAP
- ........@......... 
-..wwww........llll..
+ .......    ....... 
+..wwww...  ...llll..
 .wwwwww......llllll.
 .wwwwww......llllll.
 .wwwwww......llllll.
@@ -3212,8 +3175,8 @@ ORIENT: float
 CHANCE: 1
 SHUFFLE: bxxxx
 MAP
- ........@......... 
-..wwww........llll..
+ .......    ....... 
+..wwww...  ...llll..
 .wwwwww..{}..llllll.
 .wwwwww......llllll.
 .wwwwww......llllll.
@@ -3229,16 +3192,13 @@ ENDMAP
 # Caged fury
 
 NAME: david_entry_070
-TAGS: entry
+TAGS: entry no_rotate
 MONS: w:30 nothing / giant cockroach / w:2 worm
 MONS: w:30 nothing / ooze 
 MONS: w:20 nothing / jackal / rat
 MONS: w:30 nothing / ooze / weight:2 jelly / giant cockroach / worm w:2 / jackal w:5 / rat w:5
-
 # There is a very slight chance that a jelly or an intelligent monster 
-# (hobgoblin) might spawn inside the cage. This is okay; added an exit.
-
-FLAGS:   no_rotate
+# (hobgoblin) might spawn inside near the door. This is okay; added an exit.
 ORIENT:  float
 SHUFFLE: abcde / fghij
 SUBST:   f=A, g=B, h=C, i=D, j=E
@@ -3268,8 +3228,7 @@ ENDMAP
 # notice, except for characters with starting Traps and Doors skill, who 
 # will then bring Stealth and Evasion as well.
 NAME:    david_entry_071
-TAGS:    entry 
-FLAGS:   no_rotate
+TAGS:    entry no_rotate
 ORIENT:  float
 MONS:    goblin ; stone
 MONS:    hobgoblin ; stone
@@ -3447,15 +3406,14 @@ ENDMAP
 # Deja vu
 
 NAME: erik_entry_003
-TAGS: entry
+TAGS: entry no_rotate
 ORIENT: float
 ITEM: stone
-FLAGS: no_rotate
 MONS: rat
 SHUFFLE: {[(>
 MAP
-..........@..........
-..........>..........
+  ........@........  
+  ........>........  
 ...xcXXXXXXXXXXXcx...
 ...xXXX...1...XXXx...
 ...xXX..1...1..XXx...
@@ -3465,16 +3423,15 @@ MAP
 ...xXX..1...1..XXx...
 ...xXXX...1...XXXx...
 ...xcXXXXXXXXXXXcx...
-..........{..........
-..........@..........
+  ........{........  
+  ........@........  
 ENDMAP
 
 ##############################################################################
 # Deja vu 2
 
 NAME: erik_entry_004
-TAGS: entry no_monster_gen
-FLAGS: no_rotate
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 ITEM: stone
 MONS: rat, goblin, kobold, ooze
@@ -3775,9 +3732,9 @@ ENDMAP
 # Infinity Welcomes Careful Drivers
 
 NAME: entry_elethiomel_001
-TAGS: entry
+TAGS: entry no_rotate
 ORIENT: northwest
-FLAGS: no_rotate
+
 SHUFFLE: [{
 SUBST: ' : . x ':40, '=x.
 SUBST: c : cxxx, [ = [ T
@@ -3806,9 +3763,8 @@ ENDMAP
 ##############################################################
 # The Diamond Age, or A Young Lady's Illustrated Primer
 NAME: entry_elethiomel_002
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: west
-FLAGS:
 MONS: rat, goblin, giant bat, kobold
 ITEM: sausage / beef jerky, nothing, nothing
 SHUFFLE: {[(, 234, ef~
@@ -3844,10 +3800,9 @@ ENDMAP
 # Ruined Dwarven Fortress Basement
 
 NAME: entry_elethiomel_003
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ITEM: any armour / any weapon / nothing
 ORIENT: float
-FLAGS: no_rotate
 SHUFFLE: {[(
 SUBST: c : cx
 MAP
@@ -4005,17 +3960,16 @@ ENDMAP
 ##############################################################
 # Pentagram
 NAME:    onia_ninara_001_pentagram
-TAGS:    entry no_monster_gen no_pool_fixup
-FLAGS:   no_rotate
+TAGS:    entry no_monster_gen no_pool_fixup no_rotate
 ORIENT:  float
 SHUFFLE: ({[, x+/x+/x+/x+/cC/vV/lL/wW
 SUBST:   C=+, V=+ 
 NSUBST:  L = 1:. / *:l
 MAP
-...........................
-.............x.............
-.............x.............
-............xxx............
+       .............       
+       ......x......       
+       ......x......       
+       .....xxx.....       
 ............xxx............
 ...........xxxxx...........
 xxxxxxxxxx+xxxxx+xxxxxxxxxx
@@ -4023,32 +3977,31 @@ xxxxxxxxxx+xxxxx+xxxxxxxxxx
 ....xxxxxxx..(..xxxxxxx....
 ......xxxx.......xxxx......
 ........xx..[.{..xx........
-........xxx.....xxx........
-........xxxxx+xxxxx........
-.......xxxxxx.xxxxxx.......
-.......xxxxx...xxxxx.......
-......xxxx.......xxxx......
-......xx...........xx......
-.....x...............x.....
-...........................
+   .....xxx.....xxx.....   
+   .....xxxxx+xxxxx.....   
+   ....xxxxxx.xxxxxx....   
+   ....xxxxx...xxxxx....   
+   ...xxxx.......xxxx...   
+   ...xx...........xx...   
+   ..x.....      ....x..   
+   ........      .......   
 ENDMAP
 
 ##############################################################
 # Pyramid
 NAME: onia_ninara_002_pyramid
-TAGS: entry
-FLAGS: no_rotate
+TAGS: entry no_rotate
 ORIENT: float
 SHUFFLE: ({[
 MAP
-.........................
-............x............
-...........xxx...........
-..........xxxxx..........
-.........x..(..x.........
-........xxx...xxx........
-.......xxxxx.xxxxx.......
-......x...........x......
+        .........         
+       .....x.....       
+      .....xxx.....      
+     .....xxxxx.....      
+    .....x..(..x.....    
+   .....xxx...xxx.....   
+  .....xxxxx.xxxxx.....  
+ .....x...........x..... 
 .....xxx.........xxx.....
 ....xxxxx.......xxxxx....
 ...x..[..x.....x..{..x...
@@ -4128,8 +4081,7 @@ ENDMAP
 ##############################################################
 # The zoo
 NAME:    onia_ninara_005_the_zoo
-TAGS:    entry
-FLAGS:   no_rotate no_hmirror
+TAGS:    entry no_rotate no_hmirror
 ORIENT:  float
 SHUFFLE: 1234567
 MONS: giant gecko/giant iguana/giant lizard/giant newt/gila monster/komodo dragon
@@ -4208,9 +4160,8 @@ ENDMAP
 # A few cavern-like entry vaults, nothing fancy..
 #
 NAME:     entry_eino_001_a
-TAGS:     entry no_monster_gen
+TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northwest
-FLAGS:    no_rotate
 SUBST:    V = V T:2
 SUBST:    ' : x.
 CHANCE:   5
@@ -4243,9 +4194,8 @@ xxxxxxxx@.@xxxxxxx@.xx
 ENDMAP
 
 NAME:     entry_eino_001_b
-TAGS:     entry no_monster_gen
+TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northwest
-FLAGS:    no_rotate
 CHANCE:   5
 MAP
 xxxxxxxxxxxxxxxxxxxxx
@@ -4275,9 +4225,8 @@ ENDMAP
 # It just gets worse - caverns 2
 #
 NAME:     entry_eino_002_a
-TAGS:     entry no_monster_gen
+TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northwest
-FLAGS:    no_rotate
 NSUBST:   A = 1:= / x
 SUBST:    % = % .:5
 CHANCE:   2
@@ -4302,9 +4251,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxb.@.bxxxxxxxxxxx
 ENDMAP
 
 NAME:     entry_eino_002_b
-TAGS:     entry
+TAGS:     entry no_rotate
 ORIENT:   northeast
-FLAGS:    no_rotate
 SHUFFLE:  bvc
 SUBST:    ' : x.
 CHANCE:   4
@@ -4333,9 +4281,8 @@ xxx.@.xxxxxxxxxxxxx
 ENDMAP
 
 NAME:     entry_eino_002_c
-TAGS:     entry no_monster_gen
+TAGS:     entry no_monster_gen no_rotate
 ORIENT:   northeast
-FLAGS:    no_rotate
 SUBST:    ' : x. , " : x. , ? = x.
 CHANCE:   4
 MAP
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index eea8f2b0ea..787851fd07 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -49,10 +49,11 @@ ENDMAP
 ##############################################################################
 # Cavepeople
 #
-NAME: erik_1
+NAME:   erik_1
 ORIENT: float
-TAGS: no_monster_gen
-DEPTH: D:7-11, Lair
+CHANCE: 5
+TAGS:   no_monster_gen
+DEPTH:  D:7-11, Lair
 #
 SHUFFLE: rR/sS/uU/vV/wW/yY/zZ, uU/nN
 SUBST: r=n, R=N, s=n, S=N
@@ -61,8 +62,8 @@ SUBST: u=x, v=x, w=x, y=x, z=x
 SUBST: U=x, V=x, W=x, Y=x, Z=x
 #
 SUBST: 1 = 1:20 ., 2=2., 3=23, 4=24
-MONS: jackal/hound, human, Edmund/Jessica/Sigmund, Michael/Ijyb/Psyche
-MONS: sheep/nothing
+MONS:  jackal/hound, human, Edmund/Jessica/Sigmund, Michael/Ijyb/Psyche
+MONS:  sheep/nothing
 MAP
          xSxxxxx    xxxxxxxxxxUx
          xxssxxx    xx1xxxxxxuxx
@@ -149,7 +150,7 @@ ENDMAP
 #
 NAME:    MiniTomb
 ORIENT:  float
-DEPTH:   D:15-26
+DEPTH:   D:15-26, Crypt
 MONS:    large zombie/nothing, mummy, guardian mummy, greater mummy, large zombie
 MONS:    mummy / nothing
 SHUFFLE: 2F, cbv
@@ -213,7 +214,7 @@ ENDMAP
 # Insect pit (Lemuel)
 #
 NAME:   insect_pit
-FLAGS:  no_rotate
+TAGS:   no_rotate
 ORIENT: float
 DEPTH:  D:5-12, Elf, Vault
 SUBST:  1 = 1:70 2:60 3:25
@@ -269,6 +270,7 @@ NAME:    ice1_lemuel
 MONS:    ice statue
 TAGS:    no_pool_fixup
 ORIENT:  float
+DEPTH:   D:5-20, Elf
 SUBST:   * : *$
 SUBST:   * = |:5 * .
 SUBST:   T = TU
@@ -276,6 +278,7 @@ SHUFFLE: xb/cc, ABC
 : if crawl.coinflip() then
 KFEAT:   X = < / >
 KITEM:   X = any good_item
+SUBST:   A=., B=., C=.
 : else
 SUBST:   X=*, B=., C=.
 KFEAT:   A = teleport trap
@@ -342,7 +345,7 @@ ENDMAP
 # Oklob gauntlet
 # average of 2.5 oklobs, and at most 5 of them
 NAME:    oklob_2
-DEPTH:   D:18-27, Lair, Elf
+DEPTH:   D:18-27, Lair, Snake, Elf
 MONS:    plant, oklob plant
 ORIENT:  float
 SHUFFLE: ]})yY / defzZ
@@ -368,7 +371,7 @@ ENDMAP
 #
 # Disallowing this vault on branch starts, as brown stairs can't help there.
 # Chance for a plant to turn oklob based on dungeon level. Elf:7 is hard, but
-# considered okay (seeing as how long it is delayed in most cases anyway).
+# considered okay.
 #
 NAME:    oklob_3
 DEPTH:   D:21-27, Lair:2-10, Elf:2-7
@@ -409,9 +412,10 @@ ENDMAP
 #
 # island version for shoal in lair.des -evk
 #
-NAME: onia_ninara_012_swampy_vault
-TAGS: no_pool_fixup no_monster_gen uniq_swamp_vault
-ORIENT: float
+NAME:    onia_ninara_012_swampy_vault
+TAGS:    no_pool_fixup no_monster_gen uniq_swamp_vault
+DEPTH:   D:16-20, Lair:3-10, Swamp, Snake, Slime
+ORIENT:  float
 SHUFFLE: AB@
 SUBST: x = .:30 W x:4 
 SUBST: A : x, B : x
@@ -425,7 +429,6 @@ KMONS: E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito
 KMONS: F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
 KMONS: H = swamp drake / swamp dragon / hydra / w:20 nothing
 KITEM: H = any good_item / any potion / w:20 nothing / gold
-DEPTH: D:16-20, Lair:3-10, Swamp, Snake, Slime
 MAP
 xxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxx
 xxxxxxGGGxxxxxxGEDEExxxxGGxxxxxxx
@@ -450,10 +453,10 @@ ENDMAP
 ###########################
 # Another low-level vault - LP
 
-NAME: reptile_caves
-DEPTH: D:8-12, Lair:*
-MONS: giant gecko/giant newt, giant lizard, giant iguana, firedrake/swamp drake
-MONS: snake, brown snake, yellow snake
+NAME:  reptile_caves
+DEPTH: D:10-13, Lair, Snake
+MONS:  giant gecko/giant newt, giant lizard, giant iguana, firedrake/swamp drake
+MONS:  snake, brown snake, yellow snake
 SUBST: 4 = 34
 SUBST: 3 = 3:20 2
 SUBST: 2 = 2:20 1
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index aa76801766..7535f6820a 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -13,7 +13,7 @@ default-depth: D:12-26
 # Hellmouth (Lemuel)
 # note that other than the imps, the demons here cannot fly
 NAME:   hellmouth_1
-FLAGS:  no_rotate
+TAGS:   no_rotate
 MONS:   imp / quasit / shadow imp, hellion / rotting devil / iron devil / hairy devil / hell hound
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
 ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
@@ -46,15 +46,14 @@ ENDMAP
 # Hellmouth 2 (Lemuel)
 # note that other than the imps, the demons here cannot fly
 NAME:   hellmouth_2
-TAGS:   no_monster_gen
-FLAGS:  no_rotate
+TAGS:   no_monster_gen no_rotate
+ORIENT: float
 MONS:   imp / quasit / shadow imp / manes / lemure
 MONS:   hellion / rotting devil / iron devil / hairy devil / hell hound
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / wand of draining 
 ITEM:   wand of fire / ring of fire / Necronomicon / book of demonology / scroll of torment
 ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / w:30 nothing
 KFEAT:  A = enter_hell
-ORIENT: float
 SUBST:  d=de, ?:?.l, ?=l.
 SUBST:  b : b:30 c v .
 MAP
@@ -89,24 +88,24 @@ ORIENT: float
 KFEAT:  A = enter_hell
 SUBST:  ? : . l ?:40, ?=l.
 MAP
-................??............
-...........................??.
-....??..........l?............
-...?ll?........?l?............
-..?lll?.........l.............
-...?l........??l?.............
-...........??lll?.............
-.........?lllllll?............
-.......?llllllllll??..........
-......?lll111111llll?.........
-......?llll12Ad1lll...........
-.......?lll11111ll?...........
-........?lllll1ll?............
-.........??llllll......?......
-...........?llll?.....ll?.....
-..?.........?ll?.......ll?....
-.?............................
-..................??..........
+              ..??..      ....
+   .....     .......     ..??.
+  ..??...   ....l?..    ......
+ ..?ll?........?l?..   .......
+..?lll?.........l.... .....   
+...?l........??l?.........    
+ ..........??lll?.........    
+ ........?lllllll?........    
+  .....?llllllllll??.....     
+  ....?lll111111llll?....     
+   ...?llll12Ad1lll.......    
+   ....?lll11111ll?.......    
+   .....?lllll1ll?.........   
+ ........??llllll......?....  
+...........?llll?.....ll?...  
+..?..  .....?ll?.......ll?..  
+.?...   ...................   
+....      ........??..        
 ENDMAP
 
 
@@ -175,8 +174,7 @@ ENDMAP
 
 NAME:   lemuel_nasty_pond
 DEPTH:  Tar:*
-TAGS:   no_pool_fixup
-FLAGS:  no_rotate
+TAGS:   no_pool_fixup no_rotate
 MONS:   plant, oklob plant, death ooze, rotting devil, blue death / green death
 SUBST:  W:w.
 SUBST:  Z:w.
@@ -204,15 +202,15 @@ ENDMAP
 # Vestibule of Hell and Geryon
 ##############################################################################
 
-NAME: vestibule_of_hell
-PLACE: Hell
+NAME:   vestibule_of_hell
+PLACE:  Hell
 ORIENT: encompass
 MARKER: D=feat:enter_dis
 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
+SUBST:  D=A, G=A, C=A, T=A
+MONS:   Geryon
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -291,12 +289,16 @@ ENDMAP
 # Dispater's castle - rest of level filled up with plan_4 (irregular city)
 ##############################################################################
 
-NAME: castle_dis
-PLACE: Dis:7
-TAGS: dis
+NAME:   castle_dis
+PLACE:  Dis:7
+TAGS:   dis
 ORIENT: north
-MONS: Dispater, Fiend, Ice Fiend, iron devil, metal gargoyle
-MONS: random, random
+LFLAGS: no_tele_control
+MARKER: O = lua:item_pickup_change_flags { \
+            level_flags="!no_tele_control", item="iron rune" \
+        }
+MONS:   Dispater, Fiend, Ice Fiend, iron devil, metal gargoyle
+MONS:   random, random
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -341,11 +343,15 @@ ENDMAP
 # Asmodeus
 ##############################################################################
 
-NAME: asmodeus
-PLACE: Geh:7
+NAME:   asmodeus
+PLACE:  Geh:7
 ORIENT: encompass
-MONS: Asmodeus, Fiend, Balrug, molten gargoyle
-MONS: Serpent of Hell, random, random
+LFLAGS: no_tele_control
+MARKER: O = lua:item_pickup_change_flags { \
+            level_flags="!no_tele_control", item="obsidian rune" \
+        }
+MONS:   Asmodeus, Fiend, Balrug, molten gargoyle
+MONS:   Serpent of Hell, random, random
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -429,6 +435,10 @@ ENDMAP
 NAME:    antaeus_david_1
 PLACE:   Coc:7
 ORIENT:  encompass
+LFLAGS:  no_tele_control
+MARKER:  O = lua:item_pickup_change_flags { \
+             level_flags="!no_tele_control", item="icy rune" \
+         }
 MONS:    Antaeus, Ice Fiend, ice dragon / nothing
 ITEM:    any, any misc, any misc, any misc
 SHUFFLE: O1d / e0% / f9* / g8|
@@ -517,7 +527,11 @@ PLACE:   Coc:7
 ORIENT:  encompass
 SHUFFLE: $|, 2X
 SUBST:   X=., 3=3.
-MONS: Antaeus, Ice Fiend, ice dragon, Ice Fiend
+MONS:    Antaeus, Ice Fiend, ice dragon, Ice Fiend
+LFLAGS:  no_tele_control
+MARKER:  O = lua:item_pickup_change_flags { \
+            level_flags="!no_tele_control", item="icy rune" \
+         }
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -596,11 +610,15 @@ ENDMAP
 # Ereshkigal (Tartarus)
 ##############################################################################
 
-NAME: ereshkigal
-PLACE: Tar:7
+NAME:   ereshkigal
+PLACE:  Tar:7
 ORIENT: encompass
-MONS: Ereshkigal, necrophage, wraith, shadow, small zombie
-MONS: small skeleton, Shadow Fiend
+LFLAGS: no_tele_control
+MARKER: O = lua:item_pickup_change_flags { \
+            level_flags="!no_tele_control", item="bone rune" \
+        }
+MONS:   Ereshkigal, necrophage, wraith, shadow, small zombie
+MONS:   small skeleton, Shadow Fiend
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/help.txt b/crawl-ref/source/dat/help.txt
index 22b849aba5..e21ab52078 100644
--- a/crawl-ref/source/dat/help.txt
+++ b/crawl-ref/source/dat/help.txt
@@ -24,6 +24,8 @@ Some examples of search strings:
 or
 <w>axe && Lair</w>   both show all axes in the Lair.
 
+The stash search string is case-insensitive.
+
 
 <h>Searching by item properties:</h>
 
@@ -33,7 +35,7 @@ or rods that contain the spell.
 You can search for artefact item properties (such as <w>prevents.*teleport</w>)
 to find artefacts that have the property.
 
-If you're using <w>stash.lua</w>, you can also search by some additional item
+If you're using stash.lua, you can also search by some additional item 
 properties:
 <w>artefact</w> will find identified artefacts.
 Skill names (such as <w>Polearms</w> or <w>Long Blades</w>) will find all
@@ -46,15 +48,12 @@ init.txt, you can also search by item types such as <w>book</w> or
 
 <h>Finding Dungeon Features:</h>
 
-You can search for dungeon features by name: all shops will be found by a search
-for <w>shop</w> (including shops that do not have "shop" in their name); other
-dungeon features can also be found by name: <w>fountain</w>, <w>axe trap</w>,
+You can search for dungeon features by name: all shops will be found by a 
+search for <w>shop</w> (including shops that do not have "shop" in their name); 
+other dungeon features can also be found by name: <w>fountain</w>, <w>axe trap</w>,
 <w>altar</w>, etc. You can also search for altars by deity name: <w>Zin</w>.
 
 
-The stash search string is case-insensitive.
-
-
 <h>Non-regex operators:</h>
 
 You can use !! to negate a search string, && for a boolean AND, || for
@@ -65,28 +64,27 @@ For instance, to find rings (jewellery) but not ring mail you could use:
 %%%%
 level-map
 
-<h>Level Map ('<w>X</w><h>' in main screen):
-<w>Esc</w> : leave level map (also Space)
-<w>Dir.</w>: move cursor
-<w>/ Dir.</w>, <w>Shift-Dir.</w>: move cursor far
-<w>-</w>/<w>+</w> : scroll level map up/down
-<w>.</w>   : travel (also <w>Enter</w> and <w>,</w> and <w>;</w>)
-       (moves cursor to last travel
-       destination if still on @)
-<w><<</w>/<w>></w> : cycle through up/down stairs
-<w>^</w>   : cycle through traps
-<w>Tab</w> : cycle through shops and portals
-<w>X</w>   : cycle through travel eXclusions
-<w>x</w>   : change the radius of a travel exclusion
-<w>W</w>   : cycle through waypoints
-<w>*</w>   : cycle forward through stashes
-<w>/</w>   : cycle backward through stashes
-<w>_</w>   : cycle through altars
-<w>Ctrl-X</w> : set travel eXclusion
-<w>Ctrl-E</w> : Erase all travel exclusions
-<w>Ctrl-W</w> : set Waypoint
-<w>Ctrl-C</w> : Clear level and main maps
-<w>Ctrl-F</w> : Forget level map
+<h>Level Map ('<w>X</w><h>' in the main screen):
+<w>Esc</w>    : Leave level map (also <w>Space</w> or any unused key).
+<w>Dir.</w>   : Move the cursor.
+<w>/ Dir.</w> : Move the cursor in larger steps (also <w>Shift-Dir.</w>).
+<w>-</w>/<w>+</w>    : Scroll level map up/down
+<w>.</w>      : Start travel (also <w>Enter</w> and <w>,</w> and <w>;</w>).
+                (Moves cursor to the last travel destination if still on @.)
+<w><<</w>/<w>></w>    : Cycle through up/down stairs.
+<w>^</w>      : Cycle through traps.
+<w>Tab</w>    : Cycle through shops and portals.
+<w>X</w>      : Cycle through travel eXclusions.
+<w>x</w>      : Change the radius of a travel exclusion in three steps.
+<w>W</w>      : Cycle through waypoints.
+<w>*</w>      : Cycle forward through stashes (by default, all items).
+<w>/</w>      : Cycle backward through stashes (by default, all items).
+<w>_</w>      : Cycle through altars.
+<w>Ctrl-X</w> : Set travel exclusion.
+<w>Ctrl-E</w> : Erase all travel exclusions.
+<w>Ctrl-W</w> : Set waypoint.
+<w>Ctrl-C</w> : Clear level and main maps.
+<w>Ctrl-F</w> : Forget level map.
 %%%%
 interlevel-travel.branch.prompt
 
diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index 1d28c0aae5..6c2662c053 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -47,15 +47,15 @@ MONS: nothing / killer bee / killer bee larva
 MONS: queen bee
 ORIENT: float
 MAP
-1111..@.....1
-1211.........
-1111.........
-.............
+1111..@.     
+1211....     
+1111....     
+............1
 @.....O.....@
-.............
-.............
-.............
-1...@.......1
+   ..........
+   ......1   
+   .......   
+   1@.....   
 ENDMAP
 
 #############################################################################
@@ -75,18 +75,18 @@ SUBST: ? = a .:20
 SUBST: 1 : 1 7:2
 SUBST: 7 = 7 .
 MAP
-............................
-.....??........??aaa?aaa???.
-...?aaa?......?aaOaaaadaa?..
+   .......   ...............
+   ..??...   ..??aaa?aaa???.
+...?aaa?..   .?aaOaaaadaa?..
 .?aaa.aa??.....?aa=.aa=eaa?.
 .aa333.aaa.......a?a11aaa?..
 .aaR43..=...T...a.1aea1.a?..
 .?a.33.aaa......aa.1a2a1aa?.
 .?aa.3aa??.....aaaVa1a1aYaa.
 ..?aaaa?.......?aagW..aXfaa.
-...????.........?aaaaaaaaa?.
-.................??aaa?a??..
-............................
+   ????.........?aaaaaaaaa?.
+   ......     ...??aaa?a??  
+   ......     ............  
 ENDMAP
 
 ##############################################################################
@@ -102,15 +102,15 @@ SUBST: ; = 1:1 .
 SHUFFLE: deO
 ORIENT: float
 MAP
-...................
-.;;;;;...?aaa???...
+  ...............  
+ ;;;;;...?aaa???.  
 .;;;;;..aaa2aaaaa..
 .;;;;;.?a2e4d342a?.
 .;;;;;.?a4?2?4O4a?.
 .;;;;;..?a42?a2a...
-.;;;;;..?aaaaaa?...
-.;;;;;....????.....
-...................
+.;;;;;..?aaaaaa?   
+ ;;;;;....????..   
+  ..............   
 ENDMAP
 
 ##############################################################################
@@ -123,22 +123,20 @@ SUBST: 1 = 1.
 SUBST: 2 = 2.
 ORIENT: float
 MAP
-.....................
-.1.....2.......1.1...
-...1.....1...2..1....
-.....2.........1.....
-.1.2....1....2.....2.
-......2.....1....21..
-.1...1...1...........
-.....2.....1.21...2..
-.......1.O......21...
-...1.......1.........
-...2.....1....1..2...
-.....11.2....2...11..
-...1..1....1.........
-....2.......2....1...
-....1...1.....1......
-.....................
+ 1.....2.......1.1   
+ ..1.....1...2..1.   
+ ....2.........1..   
+ 1.2....1....2.....2 
+ .....2.....1....21  
+ 1...1...1.........  
+  ...2.....1.21...2  
+  .....1.O......21.  
+  .1.......1.......  
+  .2.....1....1..2.  
+  ...11.2....2...11  
+  .1..1....1......   
+    2.......2....1   
+    1...1.....1      
 ENDMAP
 
 ##############################################################################
@@ -165,10 +163,10 @@ MAP
 ..aa.4aaa.a.'.a...
 .aa...aaa.aa......
 .a..aaaa.'........
-..''..a..a.llllll.
- ...'..aaa.lLLLLl.
-    ...''..llllll.
-       .......... 
+..''..a..a.llllll 
+ ...'..aaa.lLLLLl 
+    ...''..llllll 
+       ........   
 ENDMAP
 
 #############################################################################
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index e4bdbc4f1c..493186511d 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -84,8 +84,7 @@ ENDMAP
 # Obligatory Oklob Plant Lair Entry Vault,
 #
 NAME:   oklobed_lair
-TAGS:   lair_entry no_monster_gen no_pool_fixup
-FLAGS:  no_rotate
+TAGS:   lair_entry no_monster_gen no_pool_fixup no_rotate
 ORIENT: float
 : if you.absdepth() >= 12 then
 MONS:   plant, oklob plant / w:50 plant
@@ -160,10 +159,9 @@ ENDMAP
 # Dragon's Lair, for generous values of Dragon
 #
 NAME: erik_lair_4
-TAGS: lair_entry
+TAGS: lair_entry no_rotate
 MONS: steam dragon / mottled dragon / swamp drake
 MONS: w:20 giant iguana / komodo dragon / giant gecko / giant lizard / nothing
-FLAGS: no_rotate
 SUBST: ? = x.c
 SHUFFLE: %*RO
 ORIENT: float
@@ -214,6 +212,7 @@ NAME:    RatsNest_Lair
 ORIENT:  northeast
 TAGS:    uniq_rats_nest
 DEPTH:   Lair
+CHANCE:  5
 SHUFFLE: 23, 34
 MONS:    rat / green rat / nothing, grey rat / orange rat / nothing
 MONS:    green rat / orange rat / nothing, orange rat / rat
@@ -248,19 +247,14 @@ xxxxxxxx.xxxxx111.xxxx.xxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##########################################
-# a pointless little "vault" by Lemuel
-#
-# edited and varied by Eino. Placing into Lair only because of the floor colour.
-# would be nice to have in the main dungeon, if it once becomes possible to
-# change the floor colour (to green/brown)
-# adapted towards less strawberries (dp). I'm against using these outside Lair.
+# a pointless little "vaults" by Lemuel
 #
-NAME: strawberry_fields_big
+NAME:   strawberry_fields_big
 ORIENT: float
-DEPTH: Lair
-SUBST: .= d .:150 1:8 2:4
-MONS: plant, butterfly
-ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
+DEPTH:  Lair
+SUBST:  .= d .:150 1:8 2:4
+MONS:   plant, butterfly
+ITEM:   strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 1
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -282,12 +276,12 @@ MAP
 .....................
 ENDMAP
 
-NAME: strawberry_fields_big_rounded
+NAME:   strawberry_fields_big_rounded
 ORIENT: float
-DEPTH: Lair
-SUBST: .= d .:140 1:8 2:4
-MONS: plant, butterfly
-ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
+DEPTH:  Lair
+SUBST:  .= d .:140 1:8 2:4
+MONS:   plant, butterfly
+ITEM:   strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 1
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -309,13 +303,13 @@ MAP
        .......
 ENDMAP
 
-NAME: strawberry_fields_round
+NAME:   strawberry_fields_round
 ORIENT: float
-TAGS: allow_dup
-DEPTH: Lair
-SUBST: .= d .:50 1:8 2:4
-MONS: plant, butterfly
-ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
+TAGS:   allow_dup
+DEPTH:  Lair
+SUBST:  .= d .:50 1:8 2:4
+MONS:   plant, butterfly
+ITEM:   strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 4
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -329,12 +323,12 @@ MAP
    ....
 ENDMAP
 
-NAME: strawberry_fields_patches_spacepadded
+NAME:   strawberry_fields_patches_spacepadded
 ORIENT: float
-DEPTH: Lair
-SUBST: .= d .:50 1:8 2:4 
-MONS: plant, butterfly
-ITEM: strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
+DEPTH:  Lair
+SUBST:  .= d .:50 1:8 2:4 
+MONS:   plant, butterfly
+ITEM:   strawberry q:1 / strawberry q:2 / strawberry q:3 w:5 / strawberry q:4 w:3 / strawberry q:5 w:2 / strawberry q:6 w:1
 CHANCE: 4
 COLOUR: . = green:20 / brown:15 / none
 MAP
@@ -551,6 +545,48 @@ xxxx..;xxx
 xxx....xxx
 ENDMAP
 
+###########################
+# Stranded yaks
+#
+NAME: Lemuel_yak_island_a
+DEPTH: Lair
+TAGS: no_pool_fixup uniq_yak_island
+MONS: yak/w:5 sheep/w:3 death yak
+SUBST: ; : .wW
+SUBST: . : . W:2
+MAP
+..............
+...;;wwww;;...
+..;wwwwwwww;..
+.;wwww..wwww;.
+.;www.1.1www;.
+.www.1>1.1www.
+.;www.1.1www;.
+.;wwww..wwww;.
+..;wwwwwwww;..
+...;;wwww;;...
+..............
+ENDMAP
+
+NAME: Lemuel_yak_island_b
+DEPTH: Swamp, Shoal
+TAGS: no_pool_fixup uniq_yak_island
+MONS: yak/w:5 sheep/w:3 death yak
+SUBST: ; = wW
+SUBST: . : . W:2
+MAP
+   ;;wwww;;   
+  ;wwwwwwww;  
+ ;wwww..wwww; 
+ ;www.1.1www; 
+ www.1>1.1www 
+ ;www.1.1www; 
+ ;wwww..wwww; 
+  ;wwwwwwww;  
+   ;;wwww;;   
+ENDMAP
+
+
 ##############################################################################
 # Branch ends: Shoal, Slime Pit, Snake Pit, Swamp
 # Note that the Shoals usually have a randomised end map; predrawn maps 
@@ -720,6 +756,11 @@ MONS:    royal jelly, acid blob, great orb of eyes / nothing
 SUBST:   ' : ' .:1,  ' : ' x:1,  ' = .x
 SUBST:   " : " .:3,  " = .c
 SHUFFLE: ([{ 
+LFLAGS:  no_tele_control
+MARKER:  X = lua:mons_dies_change_flags { \
+             level_flags="!no_tele_control", mon_name="royal jelly" \
+         }
+SUBST:  X = .
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -753,7 +794,7 @@ xxxxxxxxxxxx'................"cc**|*cc..cc*|**cc"................'''xxxxxxxxxxxx
 xxxxxxxxxxxx'................"ccc**c|cc4c|c**ccc"..................xxxxxxxxxxxxx
 xxxxxxxxxxx'................."cccccccc.3cccccccc"..................'xxxxxxxxxxxx
 xxxxxxxxxxx'................."c.4.c.4.1..4.c.4.c"..................''xxxxxxxxxxx
-xxxxxxxxxxx'..................2.c.4.c....c.4.c.2....................'xxxxxxxxxxx
+xxxxxxxxxxx'..................2.c.4.c.X..c.4.c.2....................'xxxxxxxxxxx
 xxxxxxxxxx'..........)......."cccccccc3.cccccccc"...................'xxxxxxxxxxx
 xxxxxxxxxx'.................."ccc**c|cc4c|c**ccc"...................'xxxxxxxxxxx
 xxxxxxxxxx'.................."cc**|*cc..cc*|**cc"..................'xxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index 59227ec107..e9191f4de7 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -16,6 +16,7 @@ default-depth: D:12-26
 NAME:    RatsNest_Dungeon
 ORIENT:  northeast
 TAGS:    uniq_rats_nest
+CHANCE:  5
 DEPTH:   D:5-9
 SHUFFLE: 23, 34
 MONS:    rat / nothing, grey rat / nothing
@@ -161,17 +162,9 @@ ENDMAP
 ################################################################################
 #
 # Steading of the Giant Chief
-# Note that the entrance gives you some indication of the boss
 #
-# This is intended mainly for Orc Mines. Can it appear there?
-#
-# Yes, it's a bit tough for the levels where it appears. But it has good loot.
-# And be thankful I got rid of the version with a titan!
-#
-# Lemuel
-#
-NAME:    Giant_Chief
-DEPTH:   D:11-22, Orc:2-4
+NAME:    Giant_Chief_Lemuel
+DEPTH:   D:11-22, Orc:3-4
 ORIENT:  north
 MONS:    stone giant, frost giant, fire giant
 MONS:    hill giant, cyclops
@@ -494,12 +487,13 @@ ENDMAP
 NAME:   thingy_vault
 DEPTH:  D:12-26
 ORIENT: southwest
-FLAGS:  no_rotate
+TAGS:   no_rotate
+NSUBST: ^ = 3:^ / *:.
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxx^xxxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxxx...xxxxxxxxxxxxx
-xxxxxxxxxxxxxxxxxxxxxxx.....xxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxx^^^xxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxx^^^^^xxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxx...xxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxx...xxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxx.....xxxxxxxxxxxx
@@ -538,7 +532,7 @@ ENDMAP
 NAME:   hourglass_vault
 ORIENT: southeast
 DEPTH:  D:12-26
-FLAGS:  no_rotate
+TAGS:   no_rotate
 MAP
 xxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxx.................xxxxxxxxxxxxxxxxx
@@ -582,6 +576,8 @@ ENDMAP
 NAME:   Angbandy_vault
 ORIENT: northeast
 DEPTH:  D:16-26
+SUBST:  ^ = ^.
+SUBST:  "=.", '=.', '=$, "=*, *=* |:1
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -590,34 +586,34 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ccccccccccccccccccccccccccccccccxxxxxxxx
-c*******cc..9...cc.+8c0c*c.c*c8cxxxxxxxx
-c******cc..cc..cc..cc0c.c.c.c8ccxxxxxxxx
-c*****cc..cc..cc..cc.c$c.c.c8c.cxxxxxxxx
-c****cc9.cc..cc8.cc|c.c|c.c*c0ccxxxxxxxx
-c***cc..cc..cc..cc.c.c.c.c.c.c$cxxxxxxxx
-c**cc..cc8.cc..cc.c*c.c.c.c.c.ccxxxxxxxx
-c+cc9.cc..cc..cc.c.c.c.c*c.c.c.cxxxxxxxx
-c^c..cc..cc..cc.c$c.c.c.c.c.c*ccxxxxxxxx
-c...cc..cc..cc.c.c.c9c$c.c.c.c9cxxxxxxxx
-c..cc..cc..cc$c.c.c*c.c.c.c9c9ccxxxxxxxx
-c.cc..cc..cc.c.c|c.c.c.c.c$c.c9cxxxxxxxx
-ccc..cc..cc.c.c.c.c.c.c.c.c.cc+cxxxxxxxx
-cc..cc..cc.c*c.c.c.c.c.c$c.cc..cxxxxxxxx
-c0.cc..cc.c.c.c.c8c.c*c.c.cc0.ccxxxxxxxx
-c.cc..cc*c.c.c.c.c$c.c.c.cc..cccxxxxxxxx
-c^c..cc.c.c9c.c.c.c.c.c.cc..cc.cxxxxxxxx
-c0..cc$c.c.c*c0c.c.c.c.cc..cc.0cxxxxxxxx
-c..cc.c.c9c.c.c.c$c.c.cc.9cc...cxxxxxxxx
-c.cc9c.c.c.c.c.c.c.c.cc..cc..c^cxxxxxxxx
-ccc.c.c$c.c.c.c.c.c$cc..cc..cc^cxxxxxxxx
-cc$c.c.c.c.c$c.c0c.cc..cc..cc..cxxxxxxxx
-c.c.c.c.c.c.c.c.c.cc9.cc..cc..ccxxxxxxxx
-cc.c8c.c.c$c.c.c.cc..cc..cc0.cccxxxxxxxx
-c.c$c.c$c0c.c.c.cc..cc..cc..cc$cxxxxxxxx
-cc.c.c.c.c.c*c.cc..cc..cc..cc$$cxxxxxxxx
-c.c.c.c.c.c.c.cc..cc0.cc..cc$$$cxxxxxxxx
-cc.c.c.c.c.c$cc..cc..cc..cc$$$$cxxxxxxxx
-c.c.c.c.c.c.cc.8.^..cc....+$$$$cxxxxxxxx
+c*******cc..9...cc.+8c0c"c.c"c8cxxxxxxxx
+c******cc..cc..cc..cc0c.c.c'c8ccxxxxxxxx
+c*****cc..cc..cc..cc'c'c"c.c8c.cxxxxxxxx
+c****cc9.cc..cc8.cc"c.c.c'c"c0ccxxxxxxxx
+c***cc..cc..cc..cc.c.c"c.c.c.c'cxxxxxxxx
+c**cc..cc8.cc..cc.c"c.c.c.c"c.ccxxxxxxxx
+c+cc9.cc..cc..cc"c.c.c.c"c.c.c.cxxxxxxxx
+c^c..cc..cc..cc.c'c.c.c.c.c"c"ccxxxxxxxx
+c^^.cc..cc..cc.c.c.c9c'c"c.c.c9cxxxxxxxx
+c..cc..cc..cc'c.c.c"c.c.c.c9c9ccxxxxxxxx
+c.cc..cc..cc.c.c"c.c.c.c.c'c"c9cxxxxxxxx
+ccc..cc..cc.c.c.c.c.c"c.c.c.cc+cxxxxxxxx
+cc..cc..cc'c"c'c.c.c.c.c'c.cc..cxxxxxxxx
+c0.cc..cc.c.c.c.c8c.c"c.c.cc0.ccxxxxxxxx
+c^cc..cc"c.c.c'c.c'c.c.c.cc..cccxxxxxxxx
+c^c..cc.c.c9c.c.c.c'c.c.cc..cc.cxxxxxxxx
+c0..cc'c.c.c"c0c.c.c.c.cc..cc.0cxxxxxxxx
+c..cc.c.c9c'c.c.c'c'c.cc.9cc...cxxxxxxxx
+c.cc9c.c.c"c.c.c.c.c.cc..cc..c^cxxxxxxxx
+ccc.c'c'c.c.c.c'c.c'cc..cc..cc^cxxxxxxxx
+cc'c.c.c.c'c'c.c0c.cc..cc..cc..cxxxxxxxx
+c.c.c"c.c.c.c.c'c.cc9.cc..cc..ccxxxxxxxx
+cc.c8c.c.c'c.c'c.cc..cc..cc0.cccxxxxxxxx
+c.c'c.c'c0c.c.c"cc..cc..cc..cc$cxxxxxxxx
+cc.c.c.c.c.c"c.cc..cc..cc..cc$$cxxxxxxxx
+c"c.c.c.c'c.c.cc..cc0.cc..cc$$$cxxxxxxxx
+cc.c.c.c.c"c'cc..cc..cc..cc$$$$cxxxxxxxx
+c'c.c.c'c.c.cc.8.^^.cc...^+$$$$cxxxxxxxx
 cccc@cccccccccccccccccccccccccccxxxxxxxx
 ENDMAP
 
@@ -672,6 +668,7 @@ ENDMAP
 NAME:   cross_vault
 DEPTH:  D:12-26
 ORIENT: northwest
+SUBST:  ~=.~, ^=^.
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -683,7 +680,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxx............xxxxxxxxxx
 xxxxxxxxxxxxxxx..................xxxxxxx
 xxxxxxxxxxxxx......................xxxxx
-xxxxxxxxxxxx..........w..w..........xxxx
+xxxxxxxxxxxx..........w^^w..........xxxx
 xxxxxxxxxxx........wwww++wwww........xxx
 xxxxxxxxxxx......wwwvvv^^vvvwww......xxx
 xxxxxxxxxx......wwwwv.9..9.vwwww......xx
@@ -705,8 +702,8 @@ xxxxxxxxxx.....wwwwwv......vwwwww.....xx
 xxxxxxxxxxx.....wwwwvvvvvvvvwwww.....xxx
 xxxxxxxxxxx.......wwwwwwwwwwww.......xxx
 xxxxxxxxxxxx.........wwwwww.........xxxx
-xxxxxxxxxxxxx.........~..~.........xxxxx
-xxxxxxxxxxxxxxx.......x++x.......xxxxxxx
+xxxxxxxxxxxxx........^~~~~^........xxxxx
+xxxxxxxxxxxxxxx......^x++x^......xxxxxxx
 xxxxxxxxxxxxxxxxxx...xx..xx...xxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx..@.xxxxxxxxxxxxxx
 ENDMAP
@@ -763,9 +760,9 @@ NAME:   impenetrable_vault
 DEPTH:  D:16-26
 ORIENT: southeast
 MAP
-..............@................xxxxxxxxx
-...............................xxxxxxxxx
-...............................xxxxxxxxx
+       .......@................xxxxxxxxx
+       ........................xxxxxxxxx
+       ........................xxxxxxxxx
 ...............................xxxxxxxxx
 ...............................xxxxxxxxx
 .....cccccccccccccccc..........xxxxxxxxx
@@ -785,10 +782,10 @@ MAP
 ........cc9...........^]c......xxxxxxxxx
 .........cccccccccccccccc......xxxxxxxxx
 ...............................xxxxxxxxx
-...............................xxxxxxxxx
-...............................xxxxxxxxx
-...............................xxxxxxxxx
-...............................xxxxxxxxx
+      .........................xxxxxxxxx
+      .........................xxxxxxxxx
+      .........................xxxxxxxxx
+      .........................xxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -804,8 +801,8 @@ ENDMAP
 #
 NAME:   orc_temple
 ORIENT: southwest
-FLAGS:  no_rotate
-DEPTH:  D:14-26, Orc
+TAGS:   no_rotate
+DEPTH:  D:14-26, Orc:2-4
 MONS:   orc warlord, orc priest, orc high priest, orc warrior, orc wizard
 MONS:   orc knight, orc sorcerer
 KFEAT:  C = altar_beogh
@@ -1057,8 +1054,7 @@ ENDMAP
 NAME:    erik_rubicon_a
 DEPTH:   D:10-16
 ORIENT:  south
-FLAGS:   no_rotate
-TAGS:    no_pool_fixup uniq_rubicon
+TAGS:    no_pool_fixup no_rotate uniq_rubicon
 CHANCE:  6
 ITEM:    ring of levitation / potion of levitation / nothing, potion of levitation
 ITEM:    nothing, nothing, nothing
@@ -1093,8 +1089,7 @@ ENDMAP
 NAME:    erik_rubicon_b
 DEPTH:   D:10-16
 ORIENT:  south
-FLAGS:   no_rotate
-TAGS:    uniq_rubicon
+TAGS:    no_rotate uniq_rubicon
 CHANCE:  4
 ITEM:    ring of levitation / potion of levitation / nothing, potion of levitation
 ITEM:    nothing, nothing, nothing, nothing
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 37e9a05c4d..e5fa534cd5 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -47,7 +47,6 @@ ENDMAP
 # behind, but still see the monster you're ducking from (and they can
 # still see you
 NAME:  glass_columns_a
-DEPTH:
 MAP
 .....
 .m.m.
@@ -57,7 +56,6 @@ MAP
 ENDMAP
 
 NAME:  glass_columns_b
-DEPTH:
 MAP
 .......
 .m.m.m.
@@ -69,7 +67,6 @@ MAP
 ENDMAP
 
 NAME:  glass_columns_c
-DEPTH:
 MAP
 .........
 .m.m.m.m.
@@ -85,7 +82,6 @@ ENDMAP
 ##########################################################
 # A feature encased in glass, for flavour.
 NAME:  feat_on_display
-DEPTH:
 SUBST: ? = TUl
 TAGS:  no_monster_gen no_item_gen
 MAP
@@ -140,7 +136,7 @@ ENDMAP
 # pond with fungi
 #
 NAME:  fungi_pond__lemuel
-DEPTH: D:8-20, Lair, Orc
+DEPTH: D:8-20, Lair
 TAGS:  allow_dup
 MONS:  fungus, wandering mushroom
 SUBST: 1 = . 1 2:4
@@ -168,7 +164,7 @@ ENDMAP
 # No loot but the elves' gear, but at the depth this appears that may be good
 #
 NAME:    elves_outpost_lemuel
-DEPTH:   D:14-20, Orc:2-
+DEPTH:   D:14-20, Orc:3-, Elf
 MONS:    deep elf soldier/w:4 deep elf fighter
 MONS:    w:20 deep elf mage/deep elf conjurer/deep elf summoner
 SHUFFLE: ?:/bb, :;/ww
@@ -193,7 +189,7 @@ ENDMAP
 NAME: centaur_isle
 TAGS: no_monster_gen no_pool_fixup no_rotate
 SUBST: ? = *$
-DEPTH: D:6-12
+DEPTH: D:6-12, Shoal
 MONS: centaur
 MAP
           wwww
@@ -262,16 +258,16 @@ SHUFFLE: '"
 SUBST:   ' : w .:5
 SUBST:   " = .
 MAP
-.................
-.................
-......'''''......
+   ...........   
+  .............  
+ .....'''''..... 
 .....''???''.....
 ....''?????''....
 ....''?????''....
 .....''???''.....
-......'''''......
-.................
-.................
+ .....'''''..... 
+  .............  
+   ...........   
 ENDMAP
 
 ################################
@@ -307,7 +303,7 @@ ENDMAP
 #
 # Should work without explicit floor margin (dp)
 NAME:  hive_lemuel
-DEPTH: D:9-27,Hive:*,Lair:*,Swamp:*
+DEPTH: D:9-27,Hive:*
 MONS:  killer bee, yellow wasp, red wasp, spiny worm, killer bee zombie
 SUBST: ? : .w
 SUBST: 1 = 1 a:2
@@ -328,36 +324,15 @@ MAP
   ????????
 ENDMAP
 
-###########################
-# Stranded yaks
-#
-NAME: yak_island
-DEPTH: Swamp:*
-TAGS: no_pool_fixup
-MONS: yak/w:5 sheep/w:3 death yak
-SUBST: ; : .wW
-SUBST: . : . W:2
-MAP
-..............
-...;;wwww;;...
-..;wwwwwwww;..
-.;wwww..wwww;.
-.;www.1.1www;.
-.www.1>1.1www.
-.;www.1.1www;.
-.;wwww..wwww;.
-..;wwwwwwww;..
-...;;wwww;;...
-..............
-ENDMAP
 
 ###############################################
 # My mission is to annoy. -LP
 #
-NAME: jelly_drop
-MONS: jelly
+NAME:  lemuel_jelly_drop_a
+MONS:  jelly
+TAGS:  unique_jelly_drop
 KFEAT: a = teleport trap
-DEPTH: D:8-27, Vault:*, Slime:*, Lair:*
+DEPTH: D:8-27
 MAP
 ..............
 ...vvvvvvvv...
@@ -374,14 +349,34 @@ MAP
 ..............
 ENDMAP
 
+NAME:  lemuel_jelly_drop_b
+MONS:  jelly
+TAGS:  unique_jelly_drop
+KFEAT: a = teleport trap
+DEPTH: Vault
+MAP
+vvvvvvvvvvvv
+vvv......vvv 
+vv.vvvvvv.vv 
+v1v.....vv.v 
+vvvvvvvv.v.v 
+vav111111vav 
+v.v.vvvvvvvv 
+v.vv.....v1v 
+vv.vvvvvv.vv 
+vvv......vvv 
+vvvvvvvvvvvv 
+ENDMAP
+
+
 ##############################################################
 # Aren't you glad you're a merfolk/a high-level kenku/wearing
 # those boots of levitation?
 #
-NAME: water_maze_lemuel
-TAGS: no_pool_fixup uniq_water_maze_lemuel
-ITEM: ring of levitation / ring of teleportation
-DEPTH: 5-27
+NAME:  water_maze_lemuel
+TAGS:  no_pool_fixup uniq_water_maze_lemuel
+ITEM:  ring of levitation / ring of teleportation
+DEPTH: D:5-27
 MAP
    wwwwwwwww
   wwcccccccww
@@ -400,9 +395,9 @@ wwccwwcwcwwccww
    wwwwwwwww
 ENDMAP
 
-NAME: water_boxes_lemuel
-TAGS: no_pool_fixup uniq_water_maze_lemuel
-DEPTH: 5-27
+NAME:  water_boxes_lemuel
+TAGS:  no_pool_fixup uniq_water_maze_lemuel
+DEPTH: D:5-27, Swamp
 KMONS: * = fungus
 KFEAT: * = *
 NSUBST: a = 1:= / *:x
@@ -427,10 +422,10 @@ ENDMAP
 ###############################################
 # This is probably a get-off-the-level vault. -LP
 #
-NAME: aerie
+NAME:  aerie
 DEPTH: D:12-26
-MONS: insubstantial wisp, ball lightning, vapour, air elemental
-TAGS: no_monster_gen
+MONS:  insubstantial wisp, ball lightning, vapour, air elemental
+TAGS:  no_monster_gen
 SUBST: .:..w
 SUBST: 1 = 1 w:3, 2= 2 w:3, 3 = 3 w:3, 4 = 4 |:3
 MAP
@@ -463,7 +458,7 @@ ENDMAP
 
 NAME: david_greed
 CHANCE: 4
-DEPTH: 10-26, !Orc, !Lair, !Swamp, !Shoal
+DEPTH: D:10-26, Vault, Elf
 ITEM: nothing / any good_item
 MONS: silver statue / orange crystal statue / ice statue
 SHUFFLE: d|
@@ -542,9 +537,8 @@ ENDMAP
 ###################################
 # Wizard's laboratory
 #
-NAME: minivault_6
-TAGS: mini_float allow_dup
-MONS: wizard, small abomination, large abomination
+NAME:  laboratory
+MONS:  wizard, small abomination, large abomination
 MAP
 ccccccc+cc
 c........c
@@ -622,7 +616,7 @@ ENDMAP
 ###################################
 
 NAME: minivault_10
-TAGS: mini_float allow_dup
+TAGS: mini_float
 MAP
 xxxx  xxxx
 x**x  x**x
@@ -640,7 +634,6 @@ ENDMAP
 # Multicoloured onion
 #
 NAME: minivault_11
-TAGS: allow_dup
 SHUFFLE: bcva
 MAP
 ............
@@ -661,7 +654,6 @@ ENDMAP
 # Closed-box minivault
 #
 NAME: minivault_12
-TAGS: allow_dup
 MAP
 ............
 .xxxxxxxxxx.
@@ -681,7 +673,6 @@ ENDMAP
 # Little trap spiral
 #
 NAME: minivault_13
-TAGS: allow_dup
 SHUFFLE: AB, CD, EH/FG
 KFEAT: A = any trap
 KFEAT: C = any trap
@@ -730,7 +721,6 @@ ENDMAP
 # Lava pond
 #
 NAME: minivault_15
-TAGS: allow_dup
 MONS: silver statue / ice statue
 KFEAT: 1 = <
 MAP
@@ -886,18 +876,42 @@ ENDMAP
 
 NAME: minivault_25
 TAGS: allow_dup
+SHUFFLE: XY
+SUBST: X=x, Y=+
 MAP
 ............
-.xx+xxxxxxx.
+.xxXxxxxxxx.
+.x........x.
+.x........Y.
 .x........x.
-.x........+.
 .x........x.
 .x........x.
 .x........x.
+.Y........x.
 .x........x.
-.+........x.
+.xxxxxxxXxx.
+............
+ENDMAP
+
+###################################
+
+NAME:    minivault_25_ag
+TAGS:    allow_dup
+SHUFFLE: XY, ABCDE
+SUBST:   X=x, Y=+
+SUBST:   A=?, B=%%%*, C=T, D=0009, E=89
+MAP
+............
+.xxXxxxxxxx.
+.x........x.
+.x.xYxxxx.Y.
+.x.x....X.x.
+.x.x.AA.x.x.
+.x.x.AA.x.x.
+.x.X....x.x.
+.Y.xxxxYx.x.
 .x........x.
-.xxxxxxx+xx.
+.xxxxxxxXxx.
 ............
 ENDMAP
 
@@ -980,12 +994,17 @@ ENDMAP
 ##############################
 # Worms!
 #
-NAME: worms_lemuel
-DEPTH: D:6-15, Lair, Swamp, Hive, Snake
-FLAGS: no_rotate
+NAME:  worms_lemuel
+DEPTH: D:6-15, Lair, Swamp, Hive
+TAGS:  no_rotate
 SUBST: W = W:20 w
+: if you.absdepth() > 13 then
+SUBST: 1 = 1:200 2
+:end
 KFEAT: 1 = W
-KMONS: 1 = w:20 worm / swamp worm / w:5 brain worm
+KFEAT: 2 = W
+KMONS: 1 = w:20 worm / swamp worm
+KMONS: 2 = brain worm
 MAP
    WWWWWWW
  WWWWWWWWWWW
@@ -1063,7 +1082,7 @@ ENDMAP
 #
 NAME:  dispersion
 TAGS:  allow_dup
-DEPTH: 13-26, !Orc, !Lair, !Swamp, !Shoal
+DEPTH: D:13-26, Vault
 SUBST: Y = 89
 KITEM: 8 = % / * / w:1 |
 KITEM: 9 = % / * / w:1 |
@@ -1095,10 +1114,10 @@ ENDMAP
 # Slight tweak by having a fraction (unknown to the player) of items be 
 # real. (dp)
 #
-NAME: fake_naga_vault
-DEPTH: 15-26, !Orc, !Lair, !Swamp, !Shoal
-MONS: mimic, guardian naga
-ITEM: any good_item
+NAME:  fake_naga_vault
+DEPTH: D:15-26, Vault, Elf, Snake
+MONS:  mimic, guardian naga
+ITEM:  any good_item
 : local b = crawl.random2(10)
 : if b > 7 then
 SUBST: 1 = 1d
@@ -1119,10 +1138,10 @@ ENDMAP
 ##############################################################################
 # Supply closet (Lemuel)
 #
-NAME: supply_closet
-DEPTH: 1-9
-TAGS: no_monster_gen allow_dup
-ITEM: potion of water w:20 / bread ration / meat ration / arrow / bolt / spear / any potion w:5
+NAME:  supply_closet
+DEPTH: D:1-9
+TAGS:  no_monster_gen allow_dup
+ITEM:  potion of water w:20 / bread ration / meat ration / arrow / bolt / spear / any potion w:5
 SUBST: ? = +=
 MAP
 ......
@@ -1223,7 +1242,7 @@ ENDMAP
 #
 NAME:    onia_ninara_009_dug_in_and_dangerous
 TAGS:    allow_dup
-DEPTH:   8-26, !Swamp
+DEPTH:   D:8-26, Vault
 SHUFFLE: vcb, AB?/CD!, d<>
 SUBST:   A=9, B=8, C=1, D=9
 SUBST:   ? = %:10 *:50 |:60
@@ -1242,11 +1261,11 @@ ENDMAP
 #############################
 # Pond minivault
 #
-NAME: pond
+NAME:  pond
 DEPTH: D:8-27, Lair
-MONS: plant w:30/fungus
-MONS: giant frog w:30/giant brown frog/snake/rat/green rat/swamp drake w:2
-MONS: giant mosquito
+MONS:  plant w:30/fungus
+MONS:  giant frog w:30/giant brown frog/snake/rat/green rat/swamp drake w:2
+MONS:  giant mosquito
 SUBST: ! : w.
 SUBST: 2 : 23
 SUBST: 2 = 2.
@@ -1272,13 +1291,13 @@ ENDMAP
 ##############################
 # Cookie
 #
-NAME: onia_ninara_cookie
+NAME:    onia_ninara_cookie
 SHUFFLE: ABCDEF
-SUBST: A : !, B : !, C : !, D : !, E : !, F : =, G : ~ l:50 w:50 I
-SUBST: ! : xvcba
-SUBST: H = 0 . ~ , J = 1 0:100 $:20
-ITEM: any jewellery
-MONS: giant eyeball
+SUBST:   A : !, B : !, C : !, D : !, E : !, F : =, G : ~ l:50 w:50 I
+SUBST:   ! : xvcba
+SUBST:   H = 0 . ~ , J = 1 0:100 $:20
+ITEM:    any jewellery
+MONS:    giant eyeball
 MAP
 ...........
 ..!H!H!H!..
@@ -1311,7 +1330,7 @@ ENDMAP
 # Small statue alley (Eino)
 
 NAME:   small_statue_alley_a
-TAGS:   allow_dup
+TAGS:   uniq_statue_alley
 DEPTH:  D:10-20
 CHANCE: 7
 MAP
@@ -1324,7 +1343,7 @@ xcccccxxx
 ENDMAP
 
 NAME:   small_statue_alley_b
-TAGS:   allow_dup
+TAGS:   uniq_statue_alley
 DEPTH:  D:3-10
 CHANCE: 2
 MAP
@@ -1337,8 +1356,8 @@ xcccccxxx
 ENDMAP
 
 NAME:   small_statue_alley_c
-TAGS:   allow_dup
-DEPTH:  D:6-12, Orc
+TAGS:   uniq_statue_alley
+DEPTH:  Orc
 CHANCE: 1
 MAP
 xxxcccccx
@@ -1350,95 +1369,6 @@ xcccccxxx
 ENDMAP
 
 #############################################################################
-# Circle pieces altar (Eino)
-
-NAME: circle_pieces_altar_v1
-DEPTH: 3-26
-SUBST: ' : x.
-CHANCE: 4
-MAP
-........'''''''''''''.....
-...b......'''''''.........
-...bbb......''............
-'...bbb................bb.
-'....bbbb............bbb..
-''.....bbbbb.....bbbbb...'
-'........bbbbbbbbbb.....''
-...........bbbbb.........'
-'....bb..................'
-''....bb...........bbbb..'
-'''....bbb.......bbbbb...'
-'''.....bbb.....bbbb....''
-''''.....bb.....bbb....'''
-''''.....bb..C..bb....''''
-'''.....bbb.....bb...'''''
-'''....bbbb.....bbb...''''
-''...bbbbb.......bbb...'''
-'...bbbb...........bb...''
-..........bbbb......bb..''
-......bbbbbbbbbbb.......''
-....bbbbb......bbbb....'''
-...bbbb...........bb..''''
-.bbb.....'''''.......'''''
-.......'''''''''......''''
-ENDMAP
-
-NAME: circle_pieces_altar_v2
-DEPTH: 3-26
-CHANCE: 3
-MAP
-  .....
- ..b.....             ...
- ..bbb.....       ........
-  ..bbb......    ......bb.
-   ..bbbb............bbb..
-    ...bbbbb.....bbbbb...
-   ......bbbbbbbbbb.....
-  .........bbbbb.........
-  ...bb..................
-   ...bb...........bbbb..
-    ...bbb.......bbbbb...
-    ....bbb.....bbbb....
-    .....bb.....bbb....
-   ......bb..C..bb....
-  ......bbb.....bb...
- ......bbbb.....bbb...
-.....bbbbb.......bbb...
-....bbbb...........bb...
- .........bbbb......bb..
-  ....bbbbbbbbbbb.......
- ...bbbbb......bbbb....
-...bbbb....  .....bb..
-.bbb......     ......
-......
-ENDMAP
-
-NAME: circle_pieces_altar_v3
-DEPTH: 3-26
-CHANCE: 3
-MAP
-xxxxxxxxxxxxxxxxxx
-.bbbbbbbbbbbbbbbbx
-...bbbbbbbbbbbbbbx
-@....bbbbbbbbbb...
-.......bbbbb.....@
-xbb...............
-xbbb...........bbx
-xbbbbb.......bbbbx
-xbbbbbb.....bbbbbx
-xbbbbbb.....bbbbbx
-xbbbbbb..C..bbbbbx
-xbbbbbb.....bbbbbx
-xbbbbbb.....bbbbbx
-xbbbbb.......bbbbx
-xbbb...........bbx
-@.....bbbb......bx
-..bbbbbbbbbbb.....
-xbbbbbbbbbbbbbb..@
-xxxxxxxxxxxxxxxx..
-ENDMAP
-
-#############################################################################
 # Doghouse (Eino)
 
 NAME:    doghouse_v1
@@ -1517,8 +1447,7 @@ ENDMAP
 
 NAME:    small_statue_room
 DEPTH:   D:2-26
-FLAGS:   no_hmirror no_vmirror
-TAGS:    mini_float allow_dup
+TAGS:    mini_float allow_dup no_hmirror no_vmirror
 MAP
 xxx.xxx
 xG...Gx
@@ -1545,7 +1474,7 @@ ENDMAP
 
 NAME:   small_chamber_b
 TAGS:   mini_float allow_dup
-DEPTH:  D:8-27, Elf, Snake, Vault, Crypt
+DEPTH:  D:8-27, Elf, Vault, Crypt
 MAP
 xxxxxxxxx
 xxG...Gxx
@@ -1559,7 +1488,7 @@ ENDMAP
 
 NAME:   tiny_chamber_a
 TAGS:   mini_float allow_dup
-DEPTH:  D:2-27, Elf, Snake, Vault, Crypt
+DEPTH:  D:2-27, Elf, Vault, Crypt
 MAP
 xxxxx
 x...x
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index 7d3b2a3897..2db36af5b7 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -117,9 +117,8 @@ ENDMAP
 # Wary orcs
 #
 NAME: david_orc_4
-TAGS: orc_entry
+TAGS: orc_entry no_rotate
 ORIENT: float
-FLAGS: no_rotate
 SHUFFLE: XYZ
 SUBST: ? = I F
 # around 4% of these entries have a dangerous statue
@@ -182,7 +181,7 @@ ENDMAP
 # Caught partying
 #
 NAME:  erik_orc_1
-TAGS:  orc_entry
+TAGS:  orc_entry no_rotate
 MONS:  orc, orc priest/orc wizard, weight:50 orc warrior/ogre, swamp drake
 # The drake's name is Bobby. Since you did ask.
 KITEM: 1 = sausage / nothing / animal skin / potion of confusion / potion of paralysis / potion of slowing / potion of degeneration / w:2 potion of speed / w:2 potion of might
@@ -190,7 +189,6 @@ KFEAT: 1 = 1
 ITEM:  club, potion of confusion, slice of pizza, sausage / weight:40 nothing
 ITEM:  potion of confusion / potion of water
 SHUFFLE: defO
-FLAGS: no_rotate
 ORIENT: float
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -208,7 +206,7 @@ ENDMAP
 # C'mon, you *gotta* have a *fort*!
 #
 NAME: erik_orc_2
-TAGS: orc_entry no_pool_fixup
+TAGS: orc_entry no_pool_fixup no_rotate
 MONS: orc warrior, orc priest/orc wizard, weight:100 orc / orc warrior
 : if you.absdepth() >= 10 and crawl.one_chance_in(10) then
 MONS: orc knight
@@ -218,7 +216,6 @@ MONS: orc warrior
 SUBST: G = 4
 : end
 ORIENT: float
-FLAGS: no_rotate
 SUBST: c = c:1000 x
 MAP
 .............................
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index 004d132b59..f67fe5e8f5 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -105,8 +105,7 @@ ENDMAP
 # where's the temple?
 #
 NAME: temple_secret_doors
-TAGS: temple_entry
-FLAGS: no_rotate
+TAGS: temple_entry no_rotate
 ORIENT: float
 SUBST: ? : ?:40 T:30 U, ? = T:30 U
 NSUBST: X = 1:= / *=nnn=
@@ -128,9 +127,8 @@ ENDMAP
 # temple in pool
 #
 NAME:    temple_pool_a
-TAGS:    temple_entry no_monster_gen no_pool_fixup
+TAGS:    temple_entry no_monster_gen no_pool_fixup no_rotate
 CHANCE:  3
-FLAGS:   no_rotate
 ORIENT:  float
 SHUFFLE: XY
 SUBST:   Y=w, X=.
@@ -149,9 +147,8 @@ wwwwwwwXwwwwwww.
 ENDMAP
 
 NAME:    temple_pool_b
-TAGS:    temple_entry no_monster_gen
+TAGS:    temple_entry no_monster_gen no_rotate
 CHANCE:  7
-FLAGS:   no_rotate
 ORIENT:  float
 SHUFFLE: ABCDEFGHIJKL
 SUBST:   A=W, B=W, C=W, D=w, E=w, F=w, G=w, H=w, I=w, J=w, K=w, L=w
@@ -182,29 +179,29 @@ SUBST: ? = .:100 3:30 G:5 T U:5 V:5
 SUBST: _=3., -=l.
 MONS: angel, iron devil, plant
 MAP
-........................................xxxxxxxx
-.....................'''''...............-llxxxx
-..................'''''''''''...........-llllxxx
-...............'''''''!!!'''''''........-lll2xxx
-............''''''''!!!!!!!''''''''......-llllxx
-...........'''''''!!!!!!!!!!!'''''''.......-lllx
-..........'''''!!!!!!!!!!!!!!!!!'''''........llx
-.........'''''!!!!!!!!!?!!!!!!!!!'''''........lx
-........'''''!!!!!!!!!???!!!!!!!!!'''''........x
+            ............................xxxxxxxx
+        .............'''''...............-llxxxx
+      ............'''''''''''...........-llllxxx
+    ...........'''''''!!!'''''''........-lll2xxx
+   .........''''''''!!!!!!!''''''''......-llllxx
+   ........'''''''!!!!!!!!!!!'''''''.......-lllx
+  ........'''''!!!!!!!!!!!!!!!!!'''''........llx
+ ........'''''!!!!!!!!!?!!!!!!!!!'''''........lx
+ .......'''''!!!!!!!!!???!!!!!!!!!'''''........x
 .......'''''!!!!!!!!!?????!!!!!!!!!'''''........
 .......''''!!!!!!!!!???????!!!!!!!!!''''........
 .......'''!!!!!!!!!????O????!!!!!!!!!'''........
 .......''''!!!!!!!!!???????!!!!!!!!!''''........
-.......'''''!!!!!!!!!?????!!!!!!!!!'''''........
-x.......'''''!!!!!!!!!???!!!!!!!!!'''''.........
-x........'''''!!!!!!!!!?!!!!!!!!!'''''..........
-xx._......'''''!!!!!!!!!!!!!!!!!'''''...........
-xxxxm......'''''''!!!!!!!!!!!'''''''............
-xxxxxm......''''''''!!!!!!!''''''''.............
-xxxx1m_........'''''''!!!'''''''................
-xxxxxxm_..........'''''''''''...................
-xxxxxxxxxx...........'''''......................
-xxxxxxxxxxxx....................................
+.......'''''!!!!!!!!!?????!!!!!!!!!'''''....... 
+x.......'''''!!!!!!!!!???!!!!!!!!!'''''........ 
+x........'''''!!!!!!!!!?!!!!!!!!!'''''......... 
+xx._......'''''!!!!!!!!!!!!!!!!!'''''.........  
+xxxxm......'''''''!!!!!!!!!!!'''''''..........  
+xxxxxm......''''''''!!!!!!!''''''''..........   
+xxxx1m_........'''''''!!!'''''''.............   
+xxxxxxm_..........'''''''''''...............    
+xxxxxxxxxx...........'''''................      
+xxxxxxxxxxxx...........................         
 ENDMAP
 
 
@@ -215,11 +212,10 @@ ENDMAP
 ##########################################################################
 # Circular temple (David Ploog). 12 = 1 x 12
 
-NAME: circular_temple
-PLACE: Temple
-FLAGS: no_rotate
+NAME:   circular_temple
+PLACE:  Temple
+TAGS:   no_rotate
 ORIENT: encompass
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -263,11 +259,10 @@ ENDMAP
 ##############################################################################
 # Three leaves temple (David Ploog). 12 = 3 x 4
 
-NAME: three_leaves__temple
-PLACE: Temple
-FLAGS: no_rotate
+NAME:   three_leaves__temple
+PLACE:  Temple
+TAGS:   no_rotate
 ORIENT: encompass
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -307,11 +302,10 @@ ENDMAP
 ##############################################################################
 # Twelve chambers temple (David Ploog). 12 = 12 x 1
 
-NAME: twelve_chambers_temple
-PLACE: Temple
-FLAGS: no_rotate
+NAME:   twelve_chambers_temple
+PLACE:  Temple
+TAGS:   no_rotate
 ORIENT: encompass
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -355,11 +349,10 @@ ENDMAP
 ##########################################################################
 # Another temple (David Ploog). 12 + 3 = 1 + 2 + 3 + 4 + 5
 
-NAME: triangle_temple
-PLACE: Temple
-FLAGS: no_rotate
+NAME:   triangle_temple
+PLACE:  Temple
+TAGS:   no_rotate
 ORIENT: encompass
-
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -416,12 +409,10 @@ ENDMAP
 
 ##########################################################################
 # Watery temple (Darshan Shaligram)
-NAME: water_temple
-TAGS: no_pool_fixup
-PLACE: Temple
-FLAGS: no_rotate
+NAME:   water_temple
+TAGS:   no_pool_fixup no_rotate
+PLACE:  Temple
 ORIENT: encompass
-
 MAP
 xcccccccccccccccccccccccccccccccccccccccccccccccccccx
 xcwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwcx
@@ -450,7 +441,7 @@ ENDMAP
 
 NAME:    five_temple
 PLACE:   Temple
-FLAGS:   no_rotate
+TAGS:    no_rotate
 ORIENT:  encompass
 SHUFFLE: ABC/DEF/GHI/JKL/MNO
 SHUFFLE: ABC, DEF, GHI, JKL, MNO
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 8f407317b9..a0a67c8a76 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -51,7 +51,7 @@ MONS: weight:40 nothing / weight:30 yaktaur / yaktaur captain
 MONS: weight:70 nothing / weight:40 ogre / weight:20 two-headed ogre / ogre-mage
 MONS: weight:100 nothing / shapeshifter
 SHUFFLE: 123
-ORIENT: float
+ORIENT:  float
 MAP
 1111..@......
 111..........
@@ -67,10 +67,10 @@ ENDMAP
 ##############################################################################
 # Vaults patterns 0: vanguard
 #
-NAME: david_vaults_3
-TAGS: vault_entry
-ORIENT: float
-MONS: human, human / Donald, human / Michael, human / Norris, human / Wayne
+NAME:    david_vaults_3
+TAGS:    vault_entry
+ORIENT:  float
+MONS:    human, human / Donald, human / Michael, human / Norris, human / Wayne
 SHUFFLE: 2345
 MAP
 @..........@
@@ -88,9 +88,9 @@ ENDMAP
 ##############################################################################
 # Vaults patterns I
 #
-NAME: david_vaults_4
-TAGS: vault_entry
-ORIENT: float
+NAME:    david_vaults_4
+TAGS:    vault_entry
+ORIENT:  float
 SHUFFLE: 123456
 MONS: dragon / golden dragon / ice dragon / iron dragon / shadow dragon / storm dragon
 MONS: freezing wraith / shadow wraith / wight / wraith
@@ -117,8 +117,8 @@ ENDMAP
 ##############################################################################
 # Vaults patterns II
 #
-NAME: david_vaults_5
-TAGS: vault_entry
+NAME:   david_vaults_5
+TAGS:   vault_entry
 ORIENT: float
 SUBST: ! : ! .
 SUBST: ? : ? .
@@ -192,11 +192,16 @@ PLACE:   Vault:8
 ORIENT:  encompass
 #
 # the rune's spot, occassionally put nasty on the rune
+NSUBST:  O = O / o
 KMONS:   O = 8 / 9
+KMONS:   o = 8 / 9
 KFEAT:   O = O
-NSUBST:  O = O / o
+: local brnd = crawl.random2(13)
+: if brnd == 12 then
+KFEAT:   o = any shop
+: else
 KITEM:   o = any good_item
-KFEAT:   o = w:120 . / any shop
+: end
 
 #
 # NW
diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des
index cd6097809f..ba64f85ea4 100644
--- a/crawl-ref/source/dat/zot.des
+++ b/crawl-ref/source/dat/zot.des
@@ -52,7 +52,7 @@ ENDMAP
 NAME:   lemuel_halls_of_wrath
 DEPTH:  Zot:1-4
 ORIENT: float
-FLAGS:  no_rotate
+TAGS:   no_rotate
 NSUBST: 1 = 6:2 / *=1
 SUBST:  1 = 1 .:5
 SUBST:  1 = 1 3
@@ -145,7 +145,7 @@ ENDMAP
 #
 NAME:  lemuel_golem_globe
 DEPTH: Zot:*
-FLAGS: no_rotate
+TAGS:  no_rotate
 SUBST: 1 = 1.
 MONS:  electric golem
 MAP
@@ -232,11 +232,17 @@ ENDMAP
 
 
 ##############################################################################
-# hall_of_Zot
+# hall_of_Zot_5
 
 NAME:    hall_of_Zot
 PLACE:   Zot:5
 ORIENT:  north
+LFLAGS:  no_tele_control
+MARKER:  Z = lua:item_pickup_change_flags { \
+            level_flags="!no_tele_control", item="Orb of Zot" \
+         }
+FLOORCOL: magenta
+ROCKCOL:  lightmagenta
 
 #traps
 SUBST:   C = c:1000 =
@@ -303,5 +309,45 @@ xxxxxxxxxxxxccccccccccccccccxxxxcccccccc@ccccccccxxxxccccccccccccccccxxxxxxxxxxx
 ENDMAP
 
 
+################################################################
+# For colouring the walls and floors of the first four levels
 
+NAME:     hall_of_Zot_1
+PLACE:    Zot:1
+TAGS:     transparent
+ORIENT:   float
+FLOORCOL: lightgrey
+ROCKCOL:  lightgrey
+MAP
+.
+ENDMAP
+
+NAME:     hall_of_Zot_2
+PLACE:    Zot:2
+TAGS:     transparent
+ORIENT:   float
+FLOORCOL: lightgrey
+ROCKCOL:  blue
+MAP
+.
+ENDMAP
 
+NAME:     hall_of_Zot_3
+PLACE:    Zot:3
+TAGS:     transparent
+ORIENT:   float
+FLOORCOL: blue
+ROCKCOL:  lightblue
+MAP
+.
+ENDMAP
+
+NAME:     hall_of_Zot_4
+PLACE:    Zot:4
+TAGS:     transparent
+ORIENT:   float
+FLOORCOL: lightblue
+ROCKCOL:  magenta
+MAP
+.
+ENDMAP
+\ No newline at end of file
author	dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>	2008-02-02 16:05:59 +0000
committer	dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>	2008-02-02 16:05:59 +0000
commit	37a4ac33578a9a8e9366ce1e0686dbea42dc66b8 (patch)
tree	cac13e20e8d54c1c1289e3eb9b5119e3343d4ce8
parent	8190b0f9eafb99e6e8d8d510bcf3264dcc5ff71d (diff)
download	crawl-ref-37a4ac33578a9a8e9366ce1e0686dbea42dc66b8.tar.gz crawl-ref-37a4ac33578a9a8e9366ce1e0686dbea42dc66b8.zip