Applying Darshan's new linebreak \ command across the board.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7292 c06c8d41-db1a-0410-9941-cceddc491573
author: dploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573> 2008-10-20 14:10:36 +0000
committer: dploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573> 2008-10-20 14:10:36 +0000
commit: a9f53dd003a8246adbcf8eddee5aa61d0d4c3b93 (patch)
tree: 1868f22c67e917aa6afd82ab7ab21c4f8984cd50
parent: 40d686b7f05b03bb1b63dbb062acea1c0415b1b2 (diff)
download: crawl-ref-a9f53dd003a8246adbcf8eddee5aa61d0d4c3b93.tar.gz
crawl-ref-a9f53dd003a8246adbcf8eddee5aa61d0d4c3b93.zip
14 files changed, 1196 insertions, 1145 deletions
diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index d4cd777bdd..76b7b8981e 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -396,7 +396,8 @@ ENDMAP
 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:   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
@@ -425,8 +426,12 @@ KFEAT: _ = altar_nemelex_xobeh
 SUBST: b:aa. , a:n. , d:c. , c:nn. , f:ee. , e:nn. , h:g. , g:n.
 SUBST: G:GTUVblw> , C=c
 KFEAT: z = teleport trap
-MARKER: R = lua:fog_machine { cloud_type="flame", walk_dist=1, size=9, pow_max=20, delay=10, buildup_amnt=14, buildup_time=7, spread_rate=3, start_clouds=1 }
-MARKER: B = lua:fog_machine { cloud_type="foul pestilence", walk_dist=1, size=9,  pow_max=20, delay=10, buildup_amnt=14, buildup_time=7, spread_rate=3, start_clouds=1 }
+MARKER: R = lua:fog_machine { cloud_type="flame", walk_dist=1, size=9, \
+            pow_max=20, delay=10, buildup_amnt=14, buildup_time=7, \
+            spread_rate=3, start_clouds=1 }
+MARKER: B = lua:fog_machine { cloud_type="foul pestilence", walk_dist=1, \
+            size=9,  pow_max=20, delay=10, buildup_amnt=14, buildup_time=7, \
+            spread_rate=3, start_clouds=1 }
 MAP
 CCCCCCCC+++CCCCCCCC
 Cnnnnnnn...nnnnnnnC
diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des
index 2effa01c9a..1aa39095c0 100644
--- a/crawl-ref/source/dat/crypt.des
+++ b/crawl-ref/source/dat/crypt.des
@@ -33,7 +33,9 @@ ENDMAP
 NAME:  tombwall_bobbens
 TAGS:  allow_dup
 DEPTH: Crypt
-MONS:  w:5 small zombie/large zombie/w:1 large abomination/w:1 small abomination/w:1 skeletal warrior/w:1 necrophage/w:1 ghoul/w:1 rotting hulk/w:5 small skeleton/large skeleton/w:3 nothing
+MONS:  w:50 small zombie / w:100 large zombie / skeletal warrior /  ghoul / \
+       large abomination / small abomination / necrophage / rotting hulk / \
+       w:50 small skeleton / w:100 large skeleton / w:30 nothing
 MAP
 ccccccccccccccccccccccc
 ccc1c1c1c1c1c1c1c1c1ccc
@@ -266,7 +268,7 @@ MONS:   lich
 MONS:   necromancer
 MONS:   skeletal warrior
 MONS:   flying skull
-MONS:   skeletal warrior/w:20 large skeleton/w:5 small skeleton/w:5 nothing
+MONS:   w:20 skeletal warrior / w:40 large skeleton / small skeleton / nothing
 # vampire layout
 : elseif brnd > 4 then
 MONS:   vampire mage
@@ -275,16 +277,18 @@ MONS:   vampire knight
 MONS:   vampire
 MONS:   skeletal warrior/wraith
 MONS:   dancing weapon
-MONS:   vampire/skeletal warrior/large zombie/w:5 small zombie/wraith/w:5 nothing
+MONS:   vampire / skeletal warrior / large zombie / w:5 small zombie / \
+        wraith / w:5 nothing
 # ghost layout
 : elseif brnd > 0 then
 MONS:   curse skull
 MONS:   crystal golem
 MONS:   lich
 MONS:   spectral warrior
-MONS:   flayed ghost/wraith/freezing wraith/spectral warrior
+MONS:   flayed ghost / wraith / freezing wraith / spectral warrior
 MONS:   flying skull
-MONS:   flayed ghost/wraith/freezing wraith/spectral warrior/hungry ghost/large zombie/w:5 small zombie/w:5 nothing
+MONS:   flayed ghost / wraith / freezing wraith / spectral warrior / \
+        hungry ghost / large zombie / w:5 small zombie / w:5 nothing
 # mummy layout - rare
 : else
 MONS:   greater mummy
@@ -293,7 +297,7 @@ MONS:   mummy priest
 MONS:   mummy priest
 MONS:   guardian mummy
 MONS:   flying skull
-MONS:   mummy/guardian mummy/w:5 nothing
+MONS:   mummy / guardian mummy / w:5 nothing
 : end
 SUBST:  ; = .:6 ~:2 ^:1
 NSUBST: / = 1:| / 2:* / *:%
@@ -378,7 +382,8 @@ KMONS:  N = necromancer
 KFEAT:  H = .
 KMONS:  H = hell knight
 KFEAT:  M = .
-KMONS:  M = large zombie/small zombie/large skeleton/small skeleton/ghoul/necrophage
+KMONS:  M = large zombie / small zombie / large skeleton / small skeleton / \
+            ghoul / necrophage
 KFEAT:  h = .
 KMONS:  h = titan zombie/dragon zombie/golden dragon zombie
 # red metal walls
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 44e0561c3b..aafec48724 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -41,10 +41,10 @@ KFEAT:   T = net trap
 # ("Ack! Now I'm trapped too! Help!") so I coded it in. ^.^
 NSUBST:  M = 2=E / *=M E:2
 KFEAT:   E = shaft trap
-KFEAT:   M=shallow_water
-KFEAT:   N=shallow_water
-KFEAT:   O=shallow_water
-KFEAT:   Q=shallow_water
+KFEAT:   M = shallow_water
+KFEAT:   N = shallow_water
+KFEAT:   O = shallow_water
+KFEAT:   Q = shallow_water
 SHUFFLE: M/N/O/P/Q
 SUBST:   P = MNO
 #
@@ -52,19 +52,26 @@ SUBST:   P = MNO
 # cells or create threats outside; no merfolk, alive or undead, because they 
 # insist on having deep water in their cells, which annoys me; other player 
 # species don't exist as monsters):
-KMONS: M= human / elf / orc; nothing / naga; nothing / centaur; nothing / draconian; nothing / ogre; nothing / minotaur / troll / kobold / mummy / ghoul 
-#
+KMONS: M = human / elf / orc; nothing / naga; nothing / centaur; nothing / \
+           draconian; nothing / ogre; nothing / minotaur / troll / kobold / \
+           mummy / ghoul 
 # Player monsters, zombie versions (ghouls drop out because they need sustenance
 # and can't be reanimated once starved):
-KMONS: N= human zombie / elf zombie / orc zombie / naga zombie / centaur zombie / draconian zombie / ogre zombie / minotaur zombie / troll zombie / kobold zombie / mummy
-# 
+KMONS: N = human zombie / elf zombie / orc zombie / naga zombie / ogre zombie / \
+           centaur zombie / draconian zombie / minotaur zombie / troll zombie / \
+           kobold zombie / mummy
 # Player monsters, skeleton versions:
-KMONS: O= human skeleton / elf skeleton / orc skeleton / naga skeleton / centaur skeleton / draconian skeleton / ogre skeleton / minotaur skeleton / troll skeleton / kobold skeleton / mummy
-#
+KMONS: O = human skeleton / elf skeleton / orc skeleton / naga skeleton / \
+           centaur skeleton / draconian skeleton / ogre skeleton / \
+           minotaur skeleton /troll skeleton / kobold skeleton / mummy
 # And now for something completely different (if any of these turn out to be 
 # able to escape or project spells out of their cells, they should be removed):
-KMONS: Q= orb of fire / ice dragon / shadow dragon / iron dragon / w:1 golden dragon / large abomination / tentacled monstrosity / w:1 black draconian; nothing / w:1 mottled draconian; nothing / w:1 yellow draconian; nothing / w:2 green draconian; nothing / w:1 purple draconian; nothing / w:2 red draconian; nothing / w:1 white draconian; nothing / w:1 pale draconian; nothing / nothing
-#
+KMONS: Q = orb of fire / ice dragon / shadow dragon / iron dragon / \
+           w:1 golden dragon / large abomination / tentacled monstrosity / \
+           w:1 black draconian; nothing / w:1 mottled draconian; nothing / \
+           w:1 yellow draconian; nothing / w:2 green draconian; nothing / \
+           w:1 purple draconian; nothing / w:2 red draconian; nothing / \
+           w:1 white draconian; nothing / w:1 pale draconian; nothing / nothing
 MAP
 xxxxxxxxxxxxxx     xxxxxxxxx
 xxxxxxxxMxMxMxxxxxxxMxMxMxMx
@@ -166,8 +173,8 @@ ENDMAP
 # Players can safely watch at the clouds. Autoexplore will not run into
 # the chambers, players have to search for the secret door. Likewise,
 # all exits are secret except for the safe one.
-# We may delegate this vault to another branch, where we need to take
-# less caution measures.
+# This vault is great. If need be, we may delegate it to another branch, 
+# where we less caution measures are demanded (dp).
 NAME:   elemental_entry
 TAGS:   entry no_monster_gen
 ORIENT: float
@@ -285,13 +292,13 @@ ENDMAP
 
 ############################################################################ 
 # A spiral made of rock, with lots of "windows".
-NAME: zelgadis_glass_entry_002
-TAGS: entry
-ORIENT: float
-CHANCE: 1
+NAME:    zelgadis_glass_entry_002
+TAGS:    entry
+ORIENT:  float
+CHANCE:  1
 SHUFFLE: {[(<
-SUBST: < = .
-NSUBST: X = 4:+ / *:x
+SUBST:   < = .
+NSUBST:  X = 4:+ / *:x
 MAP
 mxmxmxmxmxmxxmxxmx
 x................m
@@ -318,11 +325,11 @@ ENDMAP
 # Zaba's entry vaults
 ##############################################################################
 
-NAME: entry_zaba_1
-TAGS: entry no_monster_gen no_item_gen no_rotate
+NAME:   entry_zaba_1
+TAGS:   entry no_monster_gen no_item_gen no_rotate
 ORIENT: float
-SUBST: T = TV, ? = wW, > = >d
-ITEM: dart / stone
+SUBST:  T = TV, ? = wW, > = >d
+ITEM:   dart / stone
 MAP
 xxx@xxx@xxx@xxx
 x.............x
@@ -351,12 +358,11 @@ ENDMAP
 
 ##############################################################
 # Zaba's second entry vault ever
-
-NAME: entry_zaba_2
-TAGS: entry
-ORIENT: float
+NAME:    entry_zaba_2
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: ([{>
-SUBST: ?:???!,  ?=?., ?=!, !:cx, ===cc+
+SUBST:   ?:???!,  ?=?., ?=!, !:cx, ===cc+
 MAP
 .................@.................
 .cccccc...cccccc...cccccc...cccccc.
@@ -384,11 +390,11 @@ ENDMAP
 # Lemuel's entry vaults
 ##############################################################################
 
-NAME: lemuel_entry_001
-TAGS: entry no_rotate no_monster_gen
+NAME:   lemuel_entry_001
+TAGS:   entry no_rotate no_monster_gen
 ORIENT: float
 NSUBST: ! = 1:> / *:!
-SUBST: !:cvxGT
+SUBST:  !:cvxGT
 MAP
      x.@.x
      x.!.x
@@ -410,12 +416,11 @@ ENDMAP
 
 ##############################################################################
 # Another Lemuel entry vault
-
-NAME: lemuel_entry_002c
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    lemuel_entry_002c
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[, abc
-SUBST: a:+=, b=x, c=x
+SUBST:   a:+=, b=x, c=x
 MAP
       x@x
     xax.xcx
@@ -439,12 +444,11 @@ ENDMAP
 
 ##############################################################################
 # lemuel_entry_003
-
-NAME: lemuel_entry_003
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    lemuel_entry_003
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[, >d
-ITEM: stone / dart
+ITEM:    stone / dart
 MAP
       xxx
       x{x
@@ -466,12 +470,11 @@ ENDMAP
 
 ##############################################################################
 # lemuel_entry_004
-
-NAME: lemuel_entry_004
-TAGS: entry
-ORIENT: float
+NAME:    lemuel_entry_004
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[, '?!
-SUBST: ':.+, ?:x, !:x
+SUBST:   ':.+, ?:x, !:x
 MAP
 xxxxxxxxxxx@xxxxxx
 xxxxxxxxxxx.xxxxxx
@@ -494,12 +497,12 @@ ENDMAP
 
 ##############################################################################
 # lemuel_entrance_river
-
-NAME: lemuel_entry_005_a
-TAGS: entry no_monster_gen
-ORIENT: float
+#
+NAME:    lemuel_entry_005_a
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {}
-CHANCE: 2
+CHANCE:  2
 MAP
 xxxxxxxxxxxxxxxxxxx
 xxxxx{.......}xxxxx
@@ -521,12 +524,12 @@ xxxxx.........xxxxx
 xxxxx....@....xxxxx
 ENDMAP
 
-NAME: lemuel_entry_005_b
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 7
+NAME:    lemuel_entry_005_b
+TAGS:    entry no_monster_gen
+ORIENT:  float
+CHANCE:  7
 SHUFFLE: {}, XYZ
-SUBST: X=W, Y=w, Z=w
+SUBST:   X=W, Y=w, Z=w
 MAP
 xxxxxxxxxxxxxxxxxxx
 xxxxx{.......}xxxxx  
@@ -551,11 +554,11 @@ ENDMAP
 # Notes: chances are high that there is a shallow water path. Even if 
 # there is none, you can always see the door on the other side.
 NAME: lemuel_005_c
-TAGS: entry no_monster_gen
-ORIENT: float
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {}, ABC
-SUBST: A:=, B:x, C:x
-CHANCE: 1
+SUBST:   A:=, B:x, C:x
+CHANCE:  1
 MAP  
 xxxxxxxxxxxxxxxxxxx  
 xxxWA{.......}xxxxx  
@@ -579,7 +582,6 @@ ENDMAP
 
 ##############################################################################
 # lemuel_entrance_tunnels
-
 NAME: lemuel_entry_006_tunnels
 TAGS: entry no_monster_gen
 ORIENT: float
@@ -608,11 +610,10 @@ ENDMAP
 
 ##############################################################################
 # lemuel_entrance_funnel
-
-NAME: lemuel_entry_007_funnel
-TAGS: entry no_monster_gen
+NAME:   lemuel_entry_007_funnel
+TAGS:   entry no_monster_gen
 ORIENT: float
-SUBST: c : x.cw
+SUBST:  c : x.cw
 MAP
 xxxxxxxxxxxxxxx
 x{.....(.....[x
@@ -634,13 +635,12 @@ ENDMAP
 
 ##############################################################################
 # lemuel_entrance_muddy
-
-NAME: lemuel_entry_008_muddy
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    lemuel_entry_008_muddy
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ? = w.
-MONS: nothing / plant, nothing / fungus
+SUBST:   ? = w.
+MONS:    nothing / plant, nothing / fungus
 MAP
 xxxxxxxxxxxxxxxxxxx
 xxxxx{..1..(.1ww.[x
@@ -668,13 +668,13 @@ ENDMAP
 
 ###################################
 # broad hall
-
-NAME: lemuel_entry_009_a
-TAGS: entry no_monster_gen
-ORIENT: float
+#
+NAME:    lemuel_entry_009_a
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ? : xxcvG.
-CHANCE: 4
+SUBST:   ? : xxcvG.
+CHANCE:  4
 MAP
 xxxxxxxxxxx
 x{...(...[x
@@ -693,13 +693,14 @@ x.........x
 x>.@.>.@.>x
 ENDMAP
 
-NAME: lemuel_entry_009_b
-TAGS: entry no_monster_gen
-ORIENT: float
-SUBST: ? : xxcvG.
-ITEM: meat ration / bread ration / beef jerky / spear / potion of water / apple / club / hammer / knife
+NAME:    lemuel_entry_009_b
+TAGS:    entry no_monster_gen
+ORIENT:  float
+SUBST:   ? : xxcvG.
+ITEM:    meat ration / bread ration / beef jerky / spear / potion of water / \
+         apple / club / hammer / knife
 SHUFFLE: {[(
-CHANCE: 3
+CHANCE:  3
 MAP
 xxxxxxxxxxxx
 x{...(...[xx
@@ -718,13 +719,14 @@ x.........xx
 x>.@.>.@.>xx
 ENDMAP
 
-NAME: lemuel_entry_009_c
-TAGS: entry no_monster_gen
-ORIENT: float
-SUBST: ? : xxcvG.
-ITEM: meat ration / bread ration / beef jerky / spear / potion of water / apple / club / hammer / knife
+NAME:    lemuel_entry_009_c
+TAGS:    entry no_monster_gen
+ORIENT:  float
+SUBST:   ? : xxcvG.
+ITEM:    meat ration / bread ration / beef jerky / spear / potion of water / \
+         apple / club / hammer / knife
 SHUFFLE: {[(
-CHANCE: 3
+CHANCE:  3
 MAP
 xxxxxxxxxxxx
 x{...(...[xx
@@ -746,12 +748,12 @@ ENDMAP
 ###################################
 # behind the door
 
-NAME: lemuel_entry_010_a
-TAGS: entry no_monster_gen
-CHANCE: 5
-ORIENT: float
+NAME:    lemuel_entry_010_a
+TAGS:    entry no_monster_gen
+CHANCE:  5
+ORIENT:  float
 SHUFFLE: {(
-SUBST: b : bcvxxx
+SUBST:   b : bcvxxx
 MAP
 xxxxxxxxxxx
 x{...(...[x
@@ -766,12 +768,12 @@ xb++bbb++bx
 x....@....x
 ENDMAP
 
-NAME: lemuel_entry_010_b
-TAGS: entry no_monster_gen
-CHANCE: 5
-ORIENT: float
+NAME:    lemuel_entry_010_b
+TAGS:    entry no_monster_gen
+CHANCE:  5
+ORIENT:  float
 SHUFFLE: {(
-SUBST: b : bcvxxx
+SUBST:   b : bcvxxx
 MAP
 xxxxxxxxxxx
 x{...(...[x
@@ -785,10 +787,10 @@ ENDMAP
 #############################
 # lemuel_lava_pool
 
-NAME: lemuel_entry_011_lava_pool
-TAGS: entry no_monster_gen
+NAME:   lemuel_entry_011_lava_pool
+TAGS:   entry no_monster_gen
 ORIENT: float
-SUBST: l = l .:3
+SUBST:  l = l .:3
 MAP
     xxxxxxx
    xx..{..xx
@@ -812,10 +814,10 @@ ENDMAP
 # David's entry vaults
 ##############################################################################
 
-NAME: david_entry_001_a
-TAGS: entry no_rotate
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_001_a
+TAGS:    entry no_rotate
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: {[(
 MAP
    xxxxx  x@x  xxxxx
@@ -838,10 +840,10 @@ xx.......xx.xx.......xx
     xxxxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_001_b
-TAGS: entry no_rotate no_monster_gen
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_001_b
+TAGS:    entry no_rotate no_monster_gen
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: {[, }>
 MAP
          xxxxx
@@ -870,13 +872,12 @@ ENDMAP
 
 ##############################################################################
 # Three discs
-
-NAME: david_entry_002
-TAGS: entry no_rotate no_monster_gen
+NAME:   david_entry_002
+TAGS:   entry no_rotate no_monster_gen
 ORIENT: float
-SUBST: ' = .x
+SUBST:  ' = .x
 NSUBST: d = 1:d / *:'
-ITEM: stone/dart
+ITEM:   stone / dart
 MAP
                xxxxx
              xxx...xxx
@@ -899,14 +900,13 @@ ENDMAP
 
 ##############################################################################
 # Oval
-
-NAME: david_entry_003
-TAGS: entry no_rotate
-ORIENT: float
+NAME:    david_entry_003
+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
-SUBST: v:vxxx, c:vxxxxc
-SUBST: X=x
+SUBST:   A==, a=., B=c, b=c, D=c, d=c, E=c, e=c
+SUBST:   v:vxxx, c:vxxxxc
+SUBST:   X=x
 MAP
         xxxxxxx@xxxxxxx
     xxxxx.............xxxxx
@@ -928,13 +928,12 @@ ENDMAP
 
 ##############################################################################
 # Water temple mockup
-
-NAME: david_entry_004_temple
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
+NAME:    david_entry_004_temple
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
 SHUFFLE: {[(, cxxx
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
         ccccccc@ccccccc
     ccccc.............ccccc
@@ -953,13 +952,12 @@ ENDMAP
 
 ##############################################################################
 # Stone temple mockup
-
-NAME: david_entry_005_temple
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
+NAME:    david_entry_005_temple
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
 SHUFFLE: {[(, cxxx
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
      ccccccccccc
   cccc....[....cccc
@@ -980,13 +978,12 @@ ENDMAP
 
 ##############################################################################
 # Lava temple mockup
-
-NAME: david_entry_006_temple
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
+NAME:    david_entry_006_temple
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
 SHUFFLE: {[(, cxxx
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
          ccccc
         cc...cc
@@ -1006,10 +1003,9 @@ ENDMAP
 
 ##############################################################################
 # Twelve chambers mockup
-
-NAME: david_entry_007_temple
-TAGS: entry no_rotate
-ORIENT: float
+NAME:    david_entry_007_temple
+TAGS:    entry no_rotate
+ORIENT:  float
 SHUFFLE: {[(, cxxx
 MAP
 cccccccccccccc@ccccccccccccccc
@@ -1035,13 +1031,12 @@ ENDMAP
 
 ##############################################################################
 # Three leaves mockup
-
-NAME: david_entry_008_temple
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
+NAME:    david_entry_008_temple
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
 SHUFFLE: {[, cxxx
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
    ccccccccccccccccc
   cc.ccccccccccccc.cc
@@ -1063,13 +1058,12 @@ ENDMAP
 
 ##############################################################################
 # By the pond
-
-NAME: david_entry_009
-TAGS: entry no_monster_gen no_pool_fixup
+NAME:   david_entry_009
+TAGS:   entry no_monster_gen no_pool_fixup
 ORIENT: float
-SUBST: 0 = 0 .
+SUBST:  0 = 0 .
 NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+ITEM:   stone / dart
 MAP
 ..0.0....0..
 xxwwwwwwwxxx
@@ -1085,15 +1079,14 @@ ENDMAP
 
 ##############################################################################
 # from cave to hall
-
-NAME: david_entry_010
-TAGS: entry
-ORIENT: float
-SHUFFLE: {[(, XYZ, TVG
-SUBST: X = = c:2
-SUBST: Y=c, Z=c
-SUBST: ?=c., !=ccc.
-SHUFFLE: cxxx
+NAME:     david_entry_010
+TAGS:     entry
+ORIENT:   float
+SHUFFLE:  {[(, XYZ, TVG
+SUBST:    X = = c:2
+SUBST:    Y=c, Z=c
+SUBST:    ?=c., !=ccc.
+SHUFFLE:  cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[!.!c...cc.??...c?....................c
@@ -1116,13 +1109,13 @@ ENDMAP
 
 ################################################################
 # Circular labyrinths
-
-NAME: david_entry_011_a
-TAGS: entry no_monster_gen no_rotate
+#
+NAME:   david_entry_011_a
+TAGS:   entry no_monster_gen no_rotate
 CHANCE: 3
 ORIENT: float
 NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+ITEM:   stone / dart
 MAP
           xxxxxxxx.@.xx
        xxxx......=....xxxx
@@ -1149,12 +1142,12 @@ xx...xx....xxx.....xxx....xx...xx
           xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_011_b
-TAGS: entry no_monster_gen no_rotate
+NAME:   david_entry_011_b
+TAGS:   entry no_monster_gen no_rotate
 CHANCE: 1
 ORIENT: float
 NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+ITEM:   stone / dart
 MAP
           xxxxxxxxxxxxx
        xxxx......x....xxxx
@@ -1181,15 +1174,15 @@ xx...xx....xxx.....xxx....xx...xx
           xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_011_c
-TAGS: entry no_monster_gen no_rotate
-CHANCE: 6
-ORIENT: float
+NAME:    david_entry_011_c
+TAGS:    entry no_monster_gen no_rotate
+CHANCE:  6
+ORIENT:  float
 SHUFFLE: ab, cd, ef, gh, ij, kl, mn
-SUBST: a=., c=., e=., g=., i=., k=., m=.
-SUBST: b=x, d=x, f=x, h=x, j=x, l=x, n=x
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+SUBST:   a=., c=., e=., g=., i=., k=., m=.
+SUBST:   b=x, d=x, f=x, h=x, j=x, l=x, n=x
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
           xxxxxxxxxxxxx
        xxxx.....h.....xxxx
@@ -1219,14 +1212,13 @@ ENDMAP
 
 #####################################################################
 # Three rhombi
-
-NAME: david_entry_012
-TAGS: entry no_monster_gen
+NAME:    david_entry_012
+TAGS:    entry no_monster_gen
 SHUFFLE: WYZ{/wyz(
 SUBST:   Z=x, Y=x, W=@, C==+x
 SUBST:   z=@, y=+, w=x
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 ORIENT:  float
 MAP
   xZxxx
@@ -1247,9 +1239,8 @@ ENDMAP
 
 #####################################################################
 # A shrine (no altar)
-
-NAME: david_entry_013
-TAGS: entry no_monster_gen no_pool_fixup
+NAME:    david_entry_013
+TAGS:    entry no_monster_gen no_pool_fixup
 SHUFFLE: ABl/CDl/abw/cdw
 SUBST:   A=@, B=+, C=x, D=l
 SUBST:   a=@, b=+, c=x, d=w
@@ -1270,13 +1261,12 @@ ENDMAP
 
 #####################################################################
 # Cavernosity
-
-NAME: david_entry_014
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
-MONS: fungus
+NAME:    david_entry_014
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+MONS:    fungus
 SHUFFLE: {[(, b:xxxbcv, UVW, XYZ
-SUBST: '=.x, U==, V=x, W=x, X==, Y=x, Z=x
+SUBST:   '=.x, U==, V=x, W=x, X==, Y=x, Z=x
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxx''xxxxxxxxxxxxxxxxx%xxxxxxxxxxxxx
@@ -1661,13 +1651,12 @@ ENDMAP
 
 ##############################################################################
 # The Chase
-
-NAME: david_entry_016_chase
-TAGS: entry no_monster_gen no_pool_fixup no_rotate
-MONS: kobold, hobgoblin / goblin / giant bat
-ITEM: stone, dart
+NAME:   david_entry_016_chase
+TAGS:   entry no_monster_gen no_pool_fixup no_rotate
+MONS:   kobold, hobgoblin / goblin / giant bat
+ITEM:   stone, dart
 ORIENT: float
-SUBST: w : w l:1
+SUBST:  w : w l:1
 MAP
 xxxxxxxxxxxxx..........@
 xxxxxwwwwwwww2..........
@@ -1685,12 +1674,12 @@ xxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ##############################################################################
-# The humble fractal
-
-NAME: david_entry_017_a
-TAGS: entry no_monster_gen no_rotate
-CHANCE: 2
-ORIENT: float
+# The humble fractals
+#
+NAME:    david_entry_017_a
+TAGS:    entry no_monster_gen no_rotate
+CHANCE:  2
+ORIENT:  float
 SHUFFLE: {[(
 MAP
 xxxxxxxxxxxxxxxxxxxxxxx@x
@@ -1708,10 +1697,10 @@ x.....+.....+...........x
 xxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_017_b
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
-CHANCE: 8
+NAME:    david_entry_017_b
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  8
 SHUFFLE: cv
 MAP
 x@xxxxxxxxxxxxxxxxxxxx@x
@@ -1725,10 +1714,9 @@ ENDMAP
 
 ##############################################################################
 # Painted rooms 1
-
-NAME: david_entry_018
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    david_entry_018
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[(
 SHUFFLE: cvba
 MAP
@@ -1747,14 +1735,13 @@ ENDMAP
 
 ##############################################################################
 # Painted rooms 2
-
-NAME: david_entry_019
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    david_entry_019
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[(
 SHUFFLE: cvba
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
 xxxxxxxxxxxxxxx
 xcccccccx.....x
@@ -1769,10 +1756,9 @@ ENDMAP
 
 ##############################################################################
 # Painted rooms 3
-
-NAME: david_entry_020
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    david_entry_020
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[
 SHUFFLE: cvba
 MAP
@@ -1793,10 +1779,9 @@ ENDMAP
 
 ##############################################################################
 # Tetris
-
-NAME: david_021_tetris
-TAGS: entry
-ORIENT: float
+NAME:    david_021_tetris
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: ba
 MAP
           x.@.x
@@ -1823,13 +1808,12 @@ ENDMAP
 
 ##############################################################################
 # Central
-
-NAME: david_022_central
-TAGS: entry
-MONS: gnoll, jackal, worm
-ORIENT: float
+NAME:    david_022_central
+TAGS:    entry
+MONS:    gnoll, jackal, worm
+ORIENT:  float
 SHUFFLE: {[(], 0123, @ABC
-SUBST: A=@x, B=@x, C=@x
+SUBST:   A=@x, B=@x, C=@x
 MAP
           xxxxxx@xxxxxx
         xxx...........xxx
@@ -1859,10 +1843,9 @@ xx.xxxxx......xx1xx......xxxxx.xx
 ENDMAP
 
 ##############################################################################
-# the snail
-
-NAME: david_023_snail
-TAGS: entry no_monster_gen no_rotate
+# the spiral
+NAME:   david_023_snail
+TAGS:   entry no_monster_gen no_rotate
 ORIENT: float
 MAP
          xxxxxxxxxxxxxxxxx
@@ -1888,10 +1871,9 @@ ENDMAP
 
 ##############################################################################
 # stupid boxes
-
-NAME: david_024_boxorama
-TAGS: entry
-ORIENT: float
+NAME:    david_024_boxorama
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(<
 MAP
 xxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxx
@@ -1914,10 +1896,9 @@ ENDMAP
 
 ##############################################################################
 # two boxes missing
-
-NAME: david_025_boxes_within_box
-TAGS: entry
-ORIENT: float
+NAME:    david_025_boxes_within_box
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
 MAP
 xxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxx
@@ -1939,17 +1920,17 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ############################################################################
-# Concentric egg (David)
-
-NAME: david_026
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
-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
+# Concentric ovals (David)
+NAME:    david_026
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+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
 SHUFFLE: dD1AB/yyyyy, eE2FG/yyyyy, AB, FG
-SUBST: y=x, A==, B=x, D=., F==, G=x, E=.
-SUBST: ' : cxxxv, " : cxxxv
+SUBST:   y=x, A==, B=x, D=., F==, G=x, E=.
+SUBST:   ' : cxxxv, " : cxxxv
 MAP
 .........................
 .......xxxxx+xxxxx.......
@@ -1976,14 +1957,13 @@ ENDMAP
 
 ##############################################################################
 # Sounds of Crawl: the Slurp
-
 NAME: david_027_sounds_slurp
 TAGS: entry no_monster_gen
 MONS: generate_awake jelly / kobold
 ITEM: dart
-ORIENT: float
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: v:vxx
+SUBST:   v:vxx
 MAP
 xxxxxxxxxxxxxxxxxxxxx....@.....
 xxxxx......xxxxxxxxxx.........@
@@ -2004,11 +1984,10 @@ ENDMAP
 
 ##############################################################################
 # Sounds of Crawl: the Drone
-
 NAME: david_028_sounds_drone
 TAGS: entry no_monster_gen no_rotate
 MONS: generate_awake boring beetle / boring beetle
-ORIENT: float
+ORIENT:  float
 SHUFFLE: {<
 MAP
 xxx.....@....ccccc....@.....xxx
@@ -2034,14 +2013,13 @@ ENDMAP
 
 ##############################################################################
 # Arbitrary 1
-
-NAME: david_entry_029
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_029
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: [{
-SUBST: ' : . x ':40, '=.x
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+SUBST:   ' : . x ':40, '=.x
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
     xxxxxxxxxxxxxxxxx
    xx''xx''''''xx''xx
@@ -2066,12 +2044,11 @@ ENDMAP
 
 ##############################################################################
 # Arbitrary 2
-
-NAME: david_entry_030
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_030
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ' : . x ':40, '=.x
+SUBST:   ' : . x ':40, '=.x
 MAP
      xx'.@.'xxx
    xxx'..'...'x
@@ -2093,14 +2070,13 @@ ENDMAP
 
 ##############################################################################
 # subterranean lakeside camping
-
-NAME: david_entry_031
-TAGS: entry no_monster_gen
-ORIENT: float
-MONS: goblin, rat, giant bat
+NAME:    david_entry_031
+TAGS:    entry no_monster_gen
+ORIENT:  float
+MONS:    goblin, rat, giant bat
 SHUFFLE: {[(
-SUBST: ? : . w ?:40, ' : . x ':40
-SUBST: ? = . w, ' = . x
+SUBST:   ? : . w ?:40, ' : . x ':40
+SUBST:   ? = .w, ' = .x
 MAP
       xxxxxxxxxxxxxxxxxxxx
    xxxx?xx1.'xxxxxxxx'.33x
@@ -2123,13 +2099,12 @@ ENDMAP
 
 ##############################################################################
 # subterranean lakeside camping II
-
-NAME: david_entry_032
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    david_entry_032
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ? : . w ?:40, ' : . x ':40
-SUBST: ? = . w, ' = . x
+SUBST:   ? : . w ?:40, ' : . x ':40
+SUBST:   ? = .w, ' = .x
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxx
 xwwwwwwwww?......'''....''.
@@ -2148,12 +2123,12 @@ ENDMAP
 
 ##############################################################################
 # Arbitrary entries
-
-NAME: david_entry_033_a
-TAGS: entry
-ORIENT: float
+#
+NAME:    david_entry_033_a
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: TV
-CHANCE: 5
+CHANCE:  5
 MAP
   xx..@..xx
  xx...x...xx
@@ -2170,8 +2145,8 @@ xxxx..x..xxxx
    x..@..x
 ENDMAP
 
-NAME: david_entry_033_b
-TAGS: entry
+NAME:   david_entry_033_b
+TAGS:   entry
 ORIENT: float
 CHANCE: 5
 MAP
@@ -2192,12 +2167,11 @@ ENDMAP
 
 ##############################################################################
 # Houses by the road
-
-NAME: david_entry_034
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_034
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(, +'
-SUBST: ' : x + ':40, '=x+
+SUBST:   ' : x + ':40, '=x+
 MAP
 xxxxxxx.@.xxxxxxx
 x.....x...x.....x
@@ -2215,10 +2189,9 @@ ENDMAP
 
 ##############################################################################
 # Leaving the shelter
-
-NAME: david_entry_035
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_035
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: cvxxxx
 MAP
 @...........@
@@ -2234,11 +2207,11 @@ ENDMAP
 
 ##############################################################################
 # Disconnected?
-
-NAME: david_entry_036_a
-TAGS: entry
-ORIENT: float
-CHANCE: 2
+#
+NAME:    david_entry_036_a
+TAGS:    entry
+ORIENT:  float
+CHANCE:  2
 SHUFFLE: {[(
 MAP
 @.......xxxxx..@
@@ -2253,10 +2226,10 @@ x...xxxxx.......
 x.@.xxxxx......@
 ENDMAP
 
-NAME: david_entry_036_b
-TAGS: entry
-ORIENT: float
-CHANCE: 2
+NAME:    david_entry_036_b
+TAGS:    entry
+ORIENT:  float
+CHANCE:  2
 SHUFFLE: {[(
 MAP
 @.......xxxxx..@
@@ -2271,11 +2244,11 @@ x...xxxxx.......
 x.@.xxxxx......@
 ENDMAP
 
-NAME: david_entry_036_c
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_036_c
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-CHANCE: 2
+CHANCE:  2
 MAP
 @.......xxxxx..@
 .[......xxxxx...
@@ -2289,11 +2262,11 @@ x...xxxxx.......
 x.@.xxxxx......@
 ENDMAP
 
-NAME: david_entry_036_d
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_036_d
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-CHANCE: 2
+CHANCE:  2
 MAP
 @.......xxxxx..@
 .[......xxxxx...
@@ -2307,11 +2280,11 @@ x...=..x=.......
 x.@.xxxxx......@
 ENDMAP
 
-NAME: david_entry_036_e
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_036_e
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-CHANCE: 2
+CHANCE:  2
 MAP
 @.......xxxxx..@
 .[......xxxxx...
@@ -2327,12 +2300,11 @@ ENDMAP
 
 ##############################################################################
 # Rhombus
-
-NAME: david_entry_037
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    david_entry_037
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: ([/XY, @A
-SUBST: X=., Y=., A=x
+SUBST:   X=., Y=., A=x
 MAP
       xxAxx
    xxxx...xxxx
@@ -2345,9 +2317,9 @@ ENDMAP
 
 ##############################################################################
 # Thieves' delight
-
-NAME: david_entry_038_a
-TAGS: entry
+#
+NAME:   david_entry_038_a
+TAGS:   entry
 ORIENT: float
 CHANCE: 1
 MAP
@@ -2362,8 +2334,8 @@ x(.x%=%.xx=.x
 xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_038_b
-TAGS: entry
+NAME:   david_entry_038_b
+TAGS:   entry
 ORIENT: float
 CHANCE: 2
 MAP
@@ -2378,8 +2350,8 @@ x(.x....xxx%x
 xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_038_c
-TAGS: entry
+NAME:   david_entry_038_c
+TAGS:   entry
 ORIENT: float
 CHANCE: 1
 MAP
@@ -2394,8 +2366,8 @@ x(%x%...xxx%x
 xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_038_d
-TAGS: entry
+NAME:   david_entry_038_d
+TAGS:   entry
 ORIENT: float
 CHANCE: 1
 MAP
@@ -2410,8 +2382,8 @@ x(.x%=..x=x%x
 xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_038_e
-TAGS: entry
+NAME:   david_entry_038_e
+TAGS:   entry
 ORIENT: float
 CHANCE: 1
 MAP
@@ -2426,8 +2398,8 @@ x(%=...]x=x.x
 xxxxxxxxxx=xx
 ENDMAP
 
-NAME: david_entry_038_f
-TAGS: entry
+NAME:   david_entry_038_f
+TAGS:   entry
 ORIENT: float
 CHANCE: 2
 MAP
@@ -2442,8 +2414,8 @@ x(%=....xxx%x
 xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_038_g
-TAGS: entry
+NAME:   david_entry_038_g
+TAGS:   entry
 ORIENT: float
 CHANCE: 2
 MAP
@@ -2460,11 +2432,10 @@ ENDMAP
 
 ##############################################################################
 # Erosion
-
-NAME: david_entry_039
-TAGS: entry
+NAME:   david_entry_039
+TAGS:   entry
 ORIENT: float
-SUBST: '=cx., "=+.=, c:xxc
+SUBST:  '=cx., "=+.=, c:xxc
 MAP
 xxxxxxxxxxxxxxxxxxxx
 xccccccx.......x..c.
@@ -2479,15 +2450,15 @@ ENDMAP
 
 ##############################################################################
 # Orchard
-
-NAME: david_entry_040
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_040
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-MONS: plant
-SUBST: . = .:140 d
-KITEM: d : apple/apricot/pear/apricot/orange/banana/strawberry/lemon
-KFEAT: d = .
+MONS:    plant
+SUBST:   . = .:140 d
+KITEM:   d : apple / apricot / pear / apricot / orange / banana / \
+             strawberry / lemon
+KFEAT:   d = .
 MAP
   .....
  .......
@@ -2500,12 +2471,11 @@ ENDMAP
 
 ##############################################################################
 # Round shapes 1
-
-NAME: david_entry_041
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_041
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ? = x= , ' = x. , v : cvxxxx
+SUBST:   ? = x= , ' = x. , v : cvxxxx
 MAP
 xxxxxxxxxxxxxxxx.@
 @...xxxxxx.'xx.?..
@@ -2523,12 +2493,11 @@ ENDMAP
 
 ##############################################################################
 # Round shapes 2
-
-NAME: david_entry_042
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_042
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ' : . x ':40, '=x.
+SUBST:   ' : . x ':40, '=x.
 MAP
    x@xxxxxxxx
  xxx.xxxx...xx
@@ -2550,12 +2519,11 @@ ENDMAP
 
 ##############################################################################
 # Round shapes 3
-
-NAME: david_entry_043
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_043
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: ' : . x ':40, '=x., " : . c ":40, "=.c , c:cxx
+SUBST:   ' : . x ':40, '=x., " : . c ":40, "=.c , c:cxx
 MAP
     xxxxxxx
   xxx.....xxxx
@@ -2573,10 +2541,10 @@ ENDMAP
 
 ##############################################################################
 # Sequences
-
-NAME: david_entry_044
-TAGS: entry no_rotate
-ORIENT: float
+#
+NAME:    david_entry_044
+TAGS:    entry no_rotate
+ORIENT:  float
 SHUFFLE: {(
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -2593,10 +2561,10 @@ ENDMAP
 ##############################################################################
 # The short and straight roads
 
-NAME: david_entry_045_a
-TAGS: entry
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_045_a
+TAGS:    entry
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: {[(
 MAP
 xxxxxx@.xxx
@@ -2611,10 +2579,10 @@ xx...+....x
 xx.@xxxxxxx
 ENDMAP
 
-NAME: david_entry_045_b
-TAGS: entry
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_045_b
+TAGS:    entry
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: {[(
 MAP
 xxxxxx@.xxx
@@ -2632,9 +2600,9 @@ ENDMAP
 ##############################################################################
 # Roadkill
 
-NAME: david_entry_046
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_046
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(
 MAP
 xx.(.@x..xx@
@@ -2652,10 +2620,9 @@ ENDMAP
 
 ##############################################################################
 # Just another court
-
-NAME: david_entry_047
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_047
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[(, TVG
 MAP
 xxxxx.@.xxxxx
@@ -2674,14 +2641,13 @@ ENDMAP
 
 ##############################################################################
 # digital signposts
-
-NAME: david_entry_048_a
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_048_a
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: cvba
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
           xxxxxxxxxxx
      xxxxxx...xxxx..xx
@@ -2694,13 +2660,13 @@ x..cx...xx.xxx....xx.x....
 xxxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_048_b
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_048_b
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: cvba
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
           xxxxxxxxxxx
      xxxxxx...xxxx..xx
@@ -2715,10 +2681,9 @@ ENDMAP
 
 ##############################################################################
 # ternary
-
-NAME: david_entry_049
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_049
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: cv
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -2735,12 +2700,11 @@ ENDMAP
 
 ##############################################################################
 # For rent
-
-NAME: david_entry_050
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_050
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: [>, {(, T), TcGv, XY
-SUBST: ':.x, X=+=x, Y=+=x
+SUBST:   ':.x, X=+=x, Y=+=x
 MAP
 xxxxxxxxxxxxxxxxxx..@
 x'''''''xxxxxxxxxx...
@@ -2761,16 +2725,15 @@ ENDMAP
 
 ##############################################################################
 # Solitude
-
-NAME: david_entry_051
-TAGS: entry no_monster_gen
-ORIENT: float
+NAME:    david_entry_051
+TAGS:    entry no_monster_gen
+ORIENT:  float
 SHUFFLE: C{! / B(' / V["
-SUBST: C=., !=@
+SUBST:   C=., !=@
 SHUFFLE: B('/ zzz, V[" / yyy
-SUBST: z=x, y=x, B=., '==, V=., "==
-NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+SUBST:   z=x, y=x, B=., '==, V=., "==
+NSUBST:  . = 1:d / *:.
+ITEM:    stone / dart
 MAP
 xxxxxxxxxxxxxxxxxxx....@
 xxxxxxxCCCCCCCxxxxx.....
@@ -2793,13 +2756,12 @@ ENDMAP
 
 ##############################################################################
 # One down, four to go
-
-NAME: david_entry_052
-TAGS: entry
-MONS: rat, goblin, giant bat
-ORIENT: float
+NAME:    david_entry_052
+TAGS:    entry
+MONS:    rat, goblin, giant bat
+ORIENT:  float
 SHUFFLE: [{(
-SUBST: X = x=
+SUBST:   X = x=
 MAP
 xxxxxxxxxxxx..@
 xx.1.%1xxxxx...
@@ -2815,13 +2777,12 @@ ENDMAP
 
 ##############################################################################
 # Brainrot (Dead Infection)
-
-NAME: david_entry_053
-TAGS: entry no_monster_gen
-MONS: jackal / worm
-ORIENT: float
+NAME:    david_entry_053
+TAGS:    entry no_monster_gen
+MONS:    jackal / worm
+ORIENT:  float
 SHUFFLE: {(
-SUBST: l = l.
+SUBST:   l = l.
 MAP
 xxxxxxxxxxxxxxxxx@xxx
 @.xx...xx..xx..xx.xxx
@@ -2842,11 +2803,10 @@ ENDMAP
 
 ##############################################################################
 # Refuge
-
-NAME: david_entry_054
-TAGS: entry
+NAME:   david_entry_054
+TAGS:   entry
 ORIENT: float
-SUBST: c:xxxc, %:%.T, T:TGv.
+SUBST:  c:xxxc, %:%.T, T:TGv.
 MAP
 .....................
 .....................
@@ -2866,11 +2826,11 @@ ENDMAP
 
 ##############################################################################
 # Just another circle
-
-NAME: david_entry_055_a
-TAGS: entry no_monster_gen no_rotate
-ORIENT: float
-CHANCE: 5
+#
+NAME:    david_entry_055_a
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: lw
 MAP
       xxxxxxxxxxx
@@ -2892,10 +2852,10 @@ xx.xxxxxxxx+xxxxxxxx.xx
       xxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_055_b
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 5
+NAME:    david_entry_055_b
+TAGS:    entry no_monster_gen
+ORIENT:  float
+CHANCE:  5
 SHUFFLE: {(, lw
 MAP
       xxxxx@xxxxx
@@ -2919,12 +2879,12 @@ ENDMAP
 
 ##############################################################################
 # Stupid Stonehenge, eight and twelve columns
-
-NAME: david_entry_056_a
-TAGS: entry no_rotate
-ORIENT: float
-CHANCE: 3
-ITEM: nothing, nothing, nothing
+#
+NAME:    david_entry_056_a
+TAGS:    entry no_rotate
+ORIENT:  float
+CHANCE:  3
+ITEM:    nothing, nothing, nothing
 SHUFFLE: cccbvxxx, def}
 MAP
    ........................   
@@ -2948,10 +2908,10 @@ MAP
    ........................   
 ENDMAP
 
-NAME: david_entry_056_b
-TAGS: entry no_rotate
-ORIENT: float
-CHANCE: 7
+NAME:    david_entry_056_b
+TAGS:    entry no_rotate
+ORIENT:  float
+CHANCE:  7
 SHUFFLE: cccbvxxx
 MAP
    ....................   
@@ -2974,14 +2934,14 @@ ENDMAP
 
 ##############################################################################
 # Just another altar on DL:1
-
-NAME: david_entry_057_a_altar
-TAGS: entry
-ORIENT: float
+#
+NAME:    david_entry_057_a_altar
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[AB
-MONS: gnoll
-SUBST: A=., B=.
-CHANCE: 3
+MONS:    gnoll
+SUBST:   A=., B=.
+CHANCE:  3
 MAP
 @....B........@
 ..............[
@@ -2998,13 +2958,13 @@ A.xcccccccccccx
 @{xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_057_b_altar
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_057_b_altar
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[AB
-SUBST: A=., B=.
-MONS: gnoll
-CHANCE: 3
+SUBST:   A=., B=.
+MONS:    gnoll
+CHANCE:  3
 MAP
 @...B.........@
 ..............[
@@ -3021,13 +2981,13 @@ MAP
 @{xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_057_c_altar
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_057_c_altar
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[AB
-SUBST: A=., B=.
-MONS: gnoll
-CHANCE: 2
+SUBST:   A=., B=.
+MONS:    gnoll
+CHANCE:  2
 MAP
 @.....B.......@
 ..............[
@@ -3044,13 +3004,13 @@ MAP
 @{xxxxxxxxxxxxx
 ENDMAP
 
-NAME: david_entry_057_d_altar
-TAGS: entry
-ORIENT: float
+NAME:    david_entry_057_d_altar
+TAGS:    entry
+ORIENT:  float
 SHUFFLE: {[AB
-SUBST: A=., B=.
-MONS: gnoll
-CHANCE: 2
+SUBST:   A=., B=.
+MONS:    gnoll
+CHANCE:  2
 MAP
 @......A......@
 ..............[
@@ -3069,12 +3029,11 @@ ENDMAP
 
 ##############################################################################
 # Simpleton I
-
-NAME: david_entry_058
-TAGS: entry  no_monster_gen
+NAME:   david_entry_058
+TAGS:   entry  no_monster_gen
 ORIENT: float
 NSUBST: . = 1:d / *:.
-ITEM: stone/dart
+ITEM:   stone / dart
 MAP
 @xx           xx@
 x.xxxx     xxxx.x
@@ -3091,13 +3050,12 @@ ENDMAP
 
 ##############################################################################
 # Simpleton II
-
-NAME: david_entry_059
-TAGS: entry
-ORIENT: float
-ITEM: nothing, nothing
+NAME:    david_entry_059
+TAGS:    entry
+ORIENT:  float
+ITEM:    nothing, nothing
 SHUFFLE: =+, TVG, {[
-SUBST: c:cxx
+SUBST:   c:cxx
 MAP
 xx@...@xxxxxxxx
 xx+xxx+xxxxxxxx
@@ -3115,11 +3073,10 @@ ENDMAP
 
 ##############################################################################
 # Simpleton III
-
-NAME: david_entry_060
-TAGS: entry
-ORIENT: float
-ITEM: nothing, nothing
+NAME:    david_entry_060
+TAGS:    entry
+ORIENT:  float
+ITEM:    nothing, nothing
 SHUFFLE: =+, cx, de/{(, {[(
 MAP
 @.........@
@@ -3137,13 +3094,13 @@ ENDMAP
 
 ##############################################################################
 # Yet another D:1 altar
-
-NAME: david_entry_061_a_altar
-TAGS: entry no_monster_gen
-ORIENT: northwest
+#
+NAME:    david_entry_061_a_altar
+TAGS:    entry no_monster_gen
+ORIENT:  northwest
 SHUFFLE: Cc, {Y
-SUBST: ?=l. , Y=.
-CHANCE: 6
+SUBST:   ?=l. , Y=.
+CHANCE:  6
 MAP
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
@@ -3165,12 +3122,12 @@ xxxxxxll.??....
 xxxxxxl.........      
 ENDMAP
 
-NAME: david_entry_061_b_altar
-TAGS: entry no_monster_gen
-ORIENT: northwest
-CHANCE: 4
+NAME:    david_entry_061_b_altar
+TAGS:    entry no_monster_gen
+ORIENT:  northwest
+CHANCE:  4
 SHUFFLE: Cc, {Y
-SUBST: Y=.
+SUBST:   Y=.
 MAP
 xxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxx
@@ -3194,10 +3151,9 @@ ENDMAP
 
 ##############################################################################
 # Rooms with view
-
-NAME: david_entry_062
-TAGS: entry no_monster_gen no_pool_fixup
-ORIENT: float
+NAME:    david_entry_062
+TAGS:    entry no_monster_gen no_pool_fixup
+ORIENT:  float
 SHUFFLE: {[, lw
 MAP
 .......xxxxxx@0
@@ -3217,8 +3173,9 @@ ENDMAP
 
 ##############################################################################
 # The tiny ones I (old school)
-NAME: david_entry_063_tiny
-TAGS: entry
+#
+NAME:   david_entry_063_tiny
+TAGS:   entry
 CHANCE: 10
 ORIENT: float
 MAP
@@ -3227,9 +3184,9 @@ ENDMAP
 
 ##############################################################################
 # The tiny ones II (1x1)
-
-NAME: david_entry_064_a_tiny
-TAGS: entry
+#
+NAME:   david_entry_064_a_tiny
+TAGS:   entry
 CHANCE: 2
 ORIENT: float
 MAP
@@ -3238,8 +3195,8 @@ xxx
 xxx
 ENDMAP
 
-NAME: david_entry_064_b_tiny
-TAGS: entry
+NAME:   david_entry_064_b_tiny
+TAGS:   entry
 CHANCE: 4
 ORIENT: float
 MAP
@@ -3249,8 +3206,8 @@ MAP
 xxxxx
 ENDMAP
 
-NAME: david_entry_064_c_tiny
-TAGS: entry
+NAME:   david_entry_064_c_tiny
+TAGS:   entry
 CHANCE: 4
 ORIENT: float
 MAP
@@ -3263,9 +3220,9 @@ ENDMAP
 
 ##############################################################################
 # The tiny ones III (3x3)
-
-NAME: david_entry_065_a_tiny
-TAGS: entry
+#
+NAME:   david_entry_065_a_tiny
+TAGS:   entry
 CHANCE: 1
 ORIENT: float
 MAP
@@ -3276,8 +3233,8 @@ x...x
 xxxxx
 ENDMAP
 
-NAME: david_entry_065_b_tiny
-TAGS: entry
+NAME:   david_entry_065_b_tiny
+TAGS:   entry
 CHANCE: 3
 ORIENT: float
 MAP
@@ -3289,8 +3246,8 @@ xx...xx
 xxxxxxx
 ENDMAP
 
-NAME: david_entry_065_c_tiny
-TAGS: entry
+NAME:   david_entry_065_c_tiny
+TAGS:   entry
 CHANCE: 3
 ORIENT: float
 MAP
@@ -3302,8 +3259,8 @@ xx...x
 xxxxxx
 ENDMAP
 
-NAME: david_entry_065_d_tiny
-TAGS: entry
+NAME:   david_entry_065_d_tiny
+TAGS:   entry
 CHANCE: 3
 ORIENT: float
 MAP
@@ -3317,9 +3274,9 @@ ENDMAP
 
 ##############################################################################
 # The tiny ones IV (row)
-
-NAME: david_entry_066_a_tiny
-TAGS: entry
+#
+NAME:   david_entry_066_a_tiny
+TAGS:   entry
 CHANCE: 4
 ORIENT: float
 MAP
@@ -3328,11 +3285,11 @@ xxxxx
 xxxxx
 ENDMAP
 
-NAME: david_entry_066_b_tiny
-TAGS: entry
+NAME:   david_entry_066_b_tiny
+TAGS:   entry
 CHANCE: 3
 ORIENT: float
-SUBST: v : vcbxxx
+SUBST:  v : vcbxxx
 MAP
 xxxxx
 xvvvx
@@ -3341,8 +3298,8 @@ xvvvx
 xxxxx
 ENDMAP
 
-NAME: david_entry_066_d_tiny
-TAGS: entry
+NAME:   david_entry_066_d_tiny
+TAGS:   entry
 CHANCE: 3
 ORIENT: float
 MAP
@@ -3353,20 +3310,17 @@ ENDMAP
 
 ##############################################################################
 # Just another castle
-
 NAME: david_entry_067
 TAGS: entry no_monster_gen no_rotate
 ITEM: any, nothing, nothing
 ORIENT: float
 SHUFFLE: ]def
-SUBST: c : cx
-
+SUBST:   c : cx
 # A test run with 50 tries had precisely one level without shallow water
 # access to surroundings. This is intended and I like the low chance for this.
-
 MAP
-  .........................  
-  .........................  
+  .........................
+  .........................
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
@@ -3385,13 +3339,12 @@ MAP
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
 ...wwwwwwwwwwwwwwwwwwwwwww...
-  .........................  
-  .........................  
+  .........................
+  .........................
 ENDMAP
 
 ##############################################################################
 # Prison with walls (not Napalm Death)
-
 NAME:    david_entry_068
 TAGS:    entry no_monster_gen
 ORIENT:  float
@@ -3399,7 +3352,7 @@ SHUFFLE: ABCDEFGH
 SUBST:   A={, B=', C=', D=', E=', F=', G=', H=d
 SUBST:   ' = .:70 1 w:2
 SUBST:   . = .:60 2:1 3:1
-ITEM: stone/dart
+ITEM:    stone / dart
 MONS:    fungus, rat, giant cockroach
 MAP
 xxxxxxxxxxxxxxxxx
@@ -3417,92 +3370,91 @@ ENDMAP
 
 ##############################################################################
 # The pits are prepared
-
-NAME: david_entry_069_a
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 3
+NAME:    david_entry_069_a
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  3
 SHUFFLE: bxxxx
 MAP
- .......    ....... 
+ .......    .......
 ..wwww...  ...llll..
 .w.wwww......llllll.
 .ww{}ww......llllll.
 .wwwwww......llllll.
 ..wwww..bbbb..llll..
- ......bbbbbb...... 
-      .bbbbbb.      
-      .bbbbbb.      
-      ..bbbb..      
-       ......       
+ ......bbbbbb......
+      .bbbbbb.
+      .bbbbbb.
+      ..bbbb..
+       ......
 ENDMAP
 
-NAME: david_entry_069_b
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 3
+NAME:    david_entry_069_b
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  3
 SHUFFLE: bxxxx
 MAP
- .......    ....... 
+ .......    .......
 ..wwww...  ...llll..
 .wwwwww......llllll.
 .wwwwww......ll}{ll.
 .wwwwww......llll.l.
 ..wwww..bbbb..llll..
- ......bbbbbb...... 
-      .bbbbbb.      
-      .bbbbbb.      
-      ..bbbb..      
-       ......       
+ ......bbbbbb......
+      .bbbbbb.
+      .bbbbbb.
+      ..bbbb..
+       ......
 ENDMAP
 
 NAME: david_entry_069_c
-TAGS: entry no_monster_gen
+TAGS: entry no_monster_gen no_rotate
 ORIENT: float
 CHANCE: 3
 SHUFFLE: bxxxx
 MAP
- .......    ....... 
+ .......    .......
 ..wwww...  ...llll..
 .wwwwww......llllll.
 .wwwwww......llllll.
 .wwwwww......llllll.
 ..wwww..b=bb..llll..
- ......bb.bbb...... 
-      .bb{}bb.      
-      .bb.b=b.      
-      ..b=bb..      
-       ......       
+ ......bb.bbb......
+      .bb{}bb.
+      .bb.b=b.
+      ..b=bb..
+       ......
 ENDMAP
 
-NAME: david_entry_069_d
-TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 1
+NAME:    david_entry_069_d
+TAGS:    entry no_monster_gen no_rotate
+ORIENT:  float
+CHANCE:  1
 SHUFFLE: bxxxx
 MAP
- .......    ....... 
+ .......    .......
 ..wwww...  ...llll..
 .wwwwww..{}..llllll.
 .wwwwww......llllll.
 .wwwwww......llllll.
 ..wwww..bbbb..llll..
- ......bbbbbb...... 
-      .bbbbbb.      
-      .bbbbbb.      
-      ..bbbb..      
-       ......       
+ ......bbbbbb..... 
+      .bbbbbb.
+      .bbbbbb.
+      ..bbbb..
+       ......
 ENDMAP
 
 ##############################################################################
 # Caged fury
-
 NAME: david_entry_070
 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
+MONS: w:30 nothing / ooze / w:2 jelly / giant cockroach / w:2 worm / \
+      w:5 jackal / w:5 rat
 # There is a very slight chance that a jelly or an intelligent monster 
 # (hobgoblin) might spawn inside near the door. This is okay; added an exit.
 ORIENT:  float
@@ -3571,19 +3523,38 @@ xxx.xxxxxlll2..2.lllxxxxx.xx
 ENDMAP
 
 ##############################################################################
+# Radiant
+NAME:    david_entry_072
+TAGS:    entry no_rotate
+ORIENT:  float
+NSUBST:  ' = 1:@ / *=.x
+MAP
+'xxxxxxx'xxxxxxx'
+x.xxxxxx.xxxxxx'x
+xx..xxxx+xxxx..xx
+xxxx..+...+..xxxx
+xxxxxxx.{.xxxxxxx
+xxxx..+...+..xxxx
+xx..xxxx+xxxx..xx
+x.xxxxxx.xxxxxx.x
+'xxxxxxx'xxxxxxx'
+ENDMAP
+
+
+##############################################################################
 # Erik's entry vaults
 ##############################################################################
 
 ##############################################################################
 # From Cave to Minitemple
-
-NAME: erik_entry_001_a
-TAGS: entry
-ORIENT: float
-CHANCE: 1
+#
+NAME:    erik_entry_001_a
+TAGS:    entry
+ORIENT:  float
+CHANCE:  1
 SHUFFLE: {[(
-SUBST: X : x:20 G:4 l:1
-SUBST: c : cxxx
+SUBST:   X : x:20 G:4 l:1
+SUBST:   c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3604,13 +3575,13 @@ c(.c..c.cc...c......c..................c
 cccccccccccccccccccccccccccccccccccccccc
 ENDMAP
 
-NAME: erik_entry_001_b
-TAGS: entry
-ORIENT: float
-MONS: gnoll
-CHANCE: 3
+NAME:    erik_entry_001_b
+TAGS:    entry
+ORIENT:  float
+MONS:    gnoll
+CHANCE:  3
 SHUFFLE: {[(
-SUBST: c : cxxx
+SUBST:   c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3631,13 +3602,13 @@ c(.c..c.cc...c......c..................c
 cccccccccccccccccccccccccccccccccccccccc
 ENDMAP
 
-NAME: erik_entry_001_c
-TAGS: entry
-ORIENT: float
-MONS: centaur, orc
-CHANCE: 3
+NAME:    erik_entry_001_c
+TAGS:    entry
+ORIENT:  float
+MONS:    centaur, orc
+CHANCE:  3
 SHUFFLE: {[(
-SUBST: c : cxxx
+SUBST:   c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3658,13 +3629,13 @@ c(.c..c.cc...c......c..................c
 cccccccccccccccccccccccccccccccccccccccc
 ENDMAP
 
-NAME: erik_entry_001_d
-TAGS: entry
-ORIENT: float
-MONS: orc
-CHANCE: 3
+NAME:    erik_entry_001_d
+TAGS:    entry
+CHANCE:  3
+ORIENT:  float
+MONS:    orc
 SHUFFLE: {[(
-SUBST: c : cxxx
+SUBST:   c : cxxx
 MAP
 cccccccccccccccccccccccccccccccccccccccc
 c[c..c...cc......c.....................c
@@ -3687,7 +3658,6 @@ ENDMAP
 
 ##############################################################################
 # Triangle
-
 NAME: erik_entry_002
 TAGS: entry
 ORIENT: float
@@ -3711,12 +3681,11 @@ ENDMAP
 
 ##############################################################################
 # Deja vu
-
-NAME: erik_entry_003
-TAGS: entry no_rotate
-ORIENT: float
-ITEM: stone
-MONS: rat
+NAME:    erik_entry_003
+TAGS:    entry no_rotate
+ORIENT:  float
+ITEM:    q:1 stone
+MONS:    rat
 SHUFFLE: {[(>
 MAP
   ........@........  
@@ -3736,12 +3705,11 @@ ENDMAP
 
 ##############################################################################
 # Deja vu 2
-
-NAME: erik_entry_004
-TAGS: entry no_monster_gen no_rotate
+NAME:   erik_entry_004
+TAGS:   entry no_monster_gen no_rotate
 ORIENT: float
-ITEM: stone
-MONS: rat, goblin, kobold, ooze
+ITEM:   stone
+MONS:   rat, goblin, kobold, ooze
 MAP
 xxxxxxxxxxx@xxxxxxxxxxxxxxxxxx
 x.........l.l................x
@@ -3769,13 +3737,12 @@ ENDMAP
 
 ##############################################################################
 # Game-of-Life Blinker Ship
-
 NAME: erik_entry_005
 TAGS: entry
-ORIENT: float
+ORIENT:  float
 SHUFFLE: cxxx
 MAP
-           ...... 
+           ......
           ..c..c.
           .c.....
   ....   ..c...c.
@@ -3787,22 +3754,22 @@ MAP
 .......cc.{.....c....c....c.c.
 ........c..(..cc.....c....ccc.
 ..cc.....cc.ccc...............
-.cc.cc........... 
-..cccc........... 
-...cc......cccc.. 
-...........c...c. 
-          .c..... 
-          ..c..c. 
-           ...... 
+.cc.cc...........
+..cccc...........
+...cc......cccc..
+...........c...c.
+          .c.....
+          ..c..c.
+           ......
 ENDMAP
 
 
 ##############################################################################
 # Matt's vaults
+##############################################################################
 
 ##############################################################################
 # Refuge
-
 NAME: matt_entry_001
 TAGS: entry no_monster_gen
 ORIENT: float
@@ -3828,7 +3795,6 @@ ENDMAP
 
 ##############################################################################
 # Grand Opening
-
 NAME: matt_entry_002
 TAGS: entry
 ORIENT: float
@@ -3855,11 +3821,10 @@ ENDMAP
 
 ##############################################################################
 # Diagonals
-
 NAME: matt_entry_003
 TAGS: entry no_monster_gen
 ORIENT: float
-SUBST: ':x., ":x., ?:x., _:x.
+SUBST:  ':x., ":x., ?:x., _:x.
 MAP
 xxxxxxxxxx@xxxxxxxxxx
 xx..........'......xx
@@ -3883,13 +3848,12 @@ ENDMAP
 
 ##############################################################################
 # Debris
-
 NAME: matt_entry_004
 TAGS: entry
 ORIENT: float
 SHUFFLE: {[(
-SUBST: ' : . x ':40
-SUBST: '=x.
+SUBST:   ' : . x ':40
+SUBST:   '=x.
 MAP
 xxxxxxx@xxxxxxxxxxxxx@xxxxxxx
 x....x..'.x.................x
@@ -3916,10 +3880,9 @@ ENDMAP
 
 ##############################################################################
 # Spirals
-
 NAME: matt_entry_005
 TAGS: entry
-ORIENT: float
+ORIENT:  float
 SHUFFLE: {[(
 MAP
 xxxxxxxx@xxxxxxxxx
@@ -3941,7 +3904,6 @@ ENDMAP
 
 ##############################################################################
 # More LOS fun
-
 NAME: matt_entry_006
 TAGS: entry no_monster_gen
 ORIENT: float
@@ -3973,11 +3935,11 @@ ENDMAP
 
 ##############################################################################
 # Tucked-away holy place
-
+#
 NAME: matt_entry_007_a
 TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 1
+ORIENT:  float
+CHANCE:  1
 SHUFFLE: {[(<
 MAP
 xxx@xxx@xxx
@@ -3995,8 +3957,8 @@ ENDMAP
 
 NAME: matt_entry_007_b
 TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 3
+ORIENT:  float
+CHANCE:  3
 SHUFFLE: {[(<
 MAP
 xxx@xxx@xxx
@@ -4014,8 +3976,8 @@ ENDMAP
 
 NAME: matt_entry_007_c
 TAGS: entry no_monster_gen
-ORIENT: float
-CHANCE: 6
+ORIENT:  float
+CHANCE:  6
 SHUFFLE: {[(<
 MAP
 xxx@xxx@xxx
@@ -4037,14 +3999,12 @@ ENDMAP
 
 ##############################################################
 # Infinity Welcomes Careful Drivers
-
 NAME: entry_elethiomel_001
 TAGS: entry no_rotate
-ORIENT: northwest
-
+ORIENT:  northwest
 SHUFFLE: [{
-SUBST: ' : . x ':40, '=x.
-SUBST: c : cxxx, [ = [ T
+SUBST:   ' : . x ':40, '=x.
+SUBST:   c : cxxx, [ = [ T
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -4071,9 +4031,9 @@ ENDMAP
 # The Diamond Age, or A Young Lady's Illustrated Primer
 NAME: entry_elethiomel_002
 TAGS: entry no_monster_gen no_rotate
-ORIENT: west
-MONS: rat, goblin, giant bat, kobold
-ITEM: sausage / beef jerky, nothing, nothing
+ORIENT:  west
+MONS:    rat, goblin, giant bat, kobold
+ITEM:    sausage / beef jerky, nothing, nothing
 SHUFFLE: {[(, 234, ef~
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxx@x
@@ -4105,13 +4065,12 @@ ENDMAP
 
 ##############################################################
 # Ruined Dwarven Fortress Basement
-
 NAME: entry_elethiomel_003
 TAGS: entry no_monster_gen no_rotate
 ITEM: any armour / any weapon / nothing
-ORIENT: float
+ORIENT:  float
 SHUFFLE: {[(
-SUBST: c : cx
+SUBST:   c : cx
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xcccccccxxxxxxxxxxxxxxxxxxxcccccccx
@@ -4136,12 +4095,11 @@ ENDMAP
 
 ##############################################################
 # A Maze of Twisty Passages, All Alike
-
 NAME: entry_elethiomel_004
 TAGS: entry no_monster_gen
-ORIENT: float
-SHUFFLE:  {[(, WXYZ
-SUBST: W=., X=X., X=x=., Y=Y., Y=x=., Z=Z., Z=x=.
+ORIENT:  float
+SHUFFLE: {[(, WXYZ
+SUBST:   W=., X=X., X=x=., Y=Y., Y=x=., Z=Z., Z=x=.
 MAP
 xx@xxxxxxxxxxxxxxxxxxxxxxxxxx
 xx.x.......xxxxx...xx......xx
@@ -4162,15 +4120,15 @@ ENDMAP
 
 ##############################################################
 # It's quiet. Too quiet....
-
+#
 NAME: entry_elethiomel_005_a
 TAGS: entry no_monster_gen
-ORIENT: float
-MONS: rat / nothing, hobgoblin / goblin / nothing
+ORIENT:  float
+MONS:    rat / nothing, hobgoblin / goblin / nothing
 SHUFFLE: '"XY/ABVW, !?/CD
-SUBST: ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, V=x, W=x, Y=@x
-SUBST: c : cxx
-KFEAT: X = teleport trap / floor
+SUBST:   ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, V=x, W=x, Y=@x
+SUBST:   c : cxx
+KFEAT:   X = teleport trap / floor
 MAP
          x@x
          x.x
@@ -4190,12 +4148,12 @@ ENDMAP
 
 NAME: entry_elethiomel_005_b
 TAGS: entry no_monster_gen
-ORIENT: float
-MONS: rat / nothing, hobgoblin / goblin / nothing
+ORIENT:  float
+MONS:    rat / nothing, hobgoblin / goblin / nothing
 SHUFFLE: '"/AB, !?XY/CDVW
-SUBST: ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, Y=@x, V=x, W=x
-KFEAT: X = teleport trap / floor
-SUBST: c : cxxx
+SUBST:   ':., ":=, A:x, B:x, !:., ?:=, C:x, D:x, Y=@x, V=x, W=x
+KFEAT:   X = teleport trap / floor
+SUBST:   c : cxxx
 MAP
          x@x
          x.x
@@ -4218,10 +4176,10 @@ ENDMAP
 
 NAME: entry_elethiomel_006
 TAGS: entry
-ORIENT: float
+ORIENT:  float
 SHUFFLE: {[(, XY/AB
-KFEAT: X = teleport trap
-SUBST: Y=x, A=., B==, (=(., [=[.
+KFEAT:   X = teleport trap
+SUBST:   Y=x, A=., B==, (=(., [=[.
 MAP
    xxxx@xxxxxxx.@.x   
    xxxx.xxxxxx...xx   
@@ -4241,7 +4199,7 @@ ENDMAP
 NAME: entry_elethiomel_007
 TAGS: entry
 ORIENT: float
-SUBST: ~ = ~ .:5
+SUBST:  ~ = ~ .:5
 # Too bad there isn't a "rolling boulder" trap.
 MAP
 xxxxxxxxxx.xxxxxxxxxxxxxxx
@@ -4273,10 +4231,10 @@ 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
@@ -4284,31 +4242,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 no_rotate
-ORIENT: float
+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...
@@ -4321,7 +4279,7 @@ ENDMAP
 # Mini spirals
 NAME: onia_ninara_003_mini_spirals
 TAGS: entry
-ORIENT: float
+ORIENT:  float
 SHUFFLE: ({[<,GT, vcxxxx
 MAP
 vvvvvvvvvvv
@@ -4391,13 +4349,15 @@ NAME:    onia_ninara_005_the_zoo
 TAGS:    entry no_rotate no_hmirror
 ORIENT:  float
 SHUFFLE: 1234567
-MONS: giant gecko/giant iguana/giant lizard/giant newt/gila monster/komodo dragon
-MONS: hog/jackal/wolf/hound/war dog
-MONS: giant cockroach/giant ant/butterfly/killer bee/bumblebee/redback/giant mite
-MONS: swamp worm/lindwurm/worm/spiny worm
-MONS: swamp drake/hydra/wyvern/firedrake
-MONS: bear/polar bear/grizzly bear/black bear
-MONS: black snake/brown snake/grey snake/salamander/yellow snake
+MONS: giant gecko /giant iguana / giant lizard / giant newt / gila monster /\
+      komodo dragon
+MONS: hog / jackal / wolf / hound / war dog
+MONS: giant cockroach / giant ant / butterfly / killer bee / bumblebee /\
+      redback / giant mite
+MONS: swamp worm / lindwurm / worm / spiny worm
+MONS: swamp drake / hydra / wyvern / firedrake
+MONS: bear / polar bear / grizzly bear / black bear
+MONS: black snake / brown snake / grey snake / salamander / yellow snake
 MAP
 xxxxxxxx@xxxxxxxx
 xxxxxx.G.G.xxxxxx
@@ -4418,7 +4378,7 @@ ENDMAP
 NAME:    onia_ninara_006_larder
 TAGS:    entry
 ORIENT:  float
-MONS:    w:100 rat / w:50 giant cockroach / w:10 quokka
+MONS:    w:100 rat / w:50 giant cockroach / quokka
 ITEM:    potion of water / any potion / choko / beef jerky / grape / sausage
 SUBST:   ? = .:30 1:20 d
 SUBST:   = = = +
@@ -4436,14 +4396,13 @@ ENDMAP
 
 #############################
 # Handbag
-#
-NAME: onia_ninara_010_handbag
-TAGS: entry
-ORIENT: float
-MONS: w:30 rat / goblin / kobold 
-MONS: w:50 giant bat / w:30 small snake / snake / jackal / w:20 giant cockroach
-SUBST: ! = $ %:30
-SUBST: ? = .:20 ~
+NAME:    onia_ninara_010_handbag
+TAGS:    entry
+ORIENT:  float
+MONS:    w:30 rat / goblin / kobold 
+MONS:    giant bat / w:6 small snake / w:2 snake / w:2 jackal / w:4 giant cockroach
+SUBST:   ! = $ %:30
+SUBST:   ? = .:20 ~
 SHUFFLE: ({[<
 MAP
 ................
@@ -4613,7 +4572,6 @@ xxxxxxxxxxxxxxx@xxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ###########################################################
-
 NAME:   eino_entry_druids_welcome
 TAGS:   entry no_monster_gen
 ORIENT: float
@@ -4633,7 +4591,6 @@ x1......@......1x
 ENDMAP
 
 ###########################################################
-
 NAME:   eino_entry_tree_alley
 TAGS:   entry no_monster_gen
 ORIENT: float
@@ -4647,7 +4604,6 @@ xxxxxxxxxxxxxxxxxxx
 ENDMAP
 
 ###########################################################
-
 NAME:   eino_entry_water_cross
 TAGS:   entry no_monster_gen
 ORIENT: float
@@ -4663,7 +4619,6 @@ MAP
 ENDMAP
 
 ###########################################################
-
 NAME:   eino_entry_water_star
 TAGS:   entry no_monster_gen no_rotate
 ORIENT: float
@@ -4691,7 +4646,6 @@ ENDMAP
 
 ##############################################################
 # Rooms in the neighbourhood.
-
 NAME: misc_entry_001
 TAGS: entry no_monster_gen
 ORIENT: float
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 491e3a1585..80939fb0d7 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -99,7 +99,8 @@ ORIENT:  float
 SHUFFLE: 1X / 1X / 2l / 3Y
 SUBST:   X=x, Y:x.
 MONS:    ogre, iron devil, nothing
-ITEM:    potion of heal wounds / potion of speed / potion of berserk rage / scroll of blinking
+ITEM:    potion of heal wounds / potion of speed / potion of berserk rage /\
+         scroll of blinking
 MAP
         xx@xx
         x...x
@@ -129,12 +130,13 @@ ENDMAP
 # Starter slime pit
 #
 # The slime creature or amoeba may seem too tough for the level where this appears,
-# but since they are normal speed with no range attacks, they can be escaped
+# but since they are normal speed with no range attacks, they can be escaped.
 #
 NAME:   slime_lemuel
 DEPTH:  D:6-16, Lair
 ORIENT: float
-MONS:   w:20 ooze/jelly/fungus, slime creature/giant amoeba/oklob plant
+MONS:   w:20 ooze / jelly / fungus
+MONS:   slime creature / giant amoeba / oklob plant
 MAP
 xxxxxxxxxx
 xxxx111xxx
@@ -151,8 +153,9 @@ ENDMAP
 NAME:    MiniTomb
 ORIENT:  float
 DEPTH:   D:15-26, Crypt
-MONS:    large zombie/nothing, mummy, patrolling guardian mummy
-MONS:    patrolling greater mummy, large zombie
+MONS:    large zombie / nothing
+MONS:    mummy, patrolling guardian mummy, patrolling greater mummy
+MONS:    large zombie
 MONS:    mummy / nothing
 SHUFFLE: 2F, cbv
 MAP
@@ -328,7 +331,7 @@ ENDMAP
 NAME:    vampire
 ORIENT:  float
 DEPTH:   D:12-26, Vault, Crypt
-MONS:    rat/grey rat/w:6 green rat/w:3 orange rat/w:20 giant bat
+MONS:    rat / grey rat / w:6 green rat / w:3 orange rat / w:20 giant bat
 MONS:    flying skull, human zombie
 MONS:    vampire, vampire mage, vampire knight
 KITEM:   > = any good_item
@@ -404,7 +407,7 @@ ENDMAP
 # considered okay. Has between 1 and 3 oklob plants.
 # Single oklob at absolute depth 10, expect 2 oklobs at depth 20.
 # Rarely (2.5% chance) the whole vault is enclosed. This is the hardest case,
-# and the walls are always diggable then. 
+# and the walls are always diggable then.
 #
 NAME:    oklob_3
 DEPTH:   D:18-27, Lair:2-10, Elf:2-7
@@ -456,8 +459,10 @@ KFEAT: F = w:150 w / w:70 W / ~ / . / x
 KFEAT: G = x / . / w / W
 KFEAT: H = . / W
 KMONS: D = Plant / w:200 nothing
-KMONS: E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
-KMONS: F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
+KMONS: E = w:2 slime creature / swamp worm / giant blowfly /\
+           w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
+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
 MAP
@@ -484,19 +489,20 @@ ENDMAP
 ###########################
 # Another low-level vault - LP
 
-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
-SUBST: 1 = 1.
+NAME:    reptile_caves
+DEPTH:   D:10-13, Lair, Snake
+ORIENT:  float
+MONS:    giant gecko / giant newt, giant lizard, giant iguana
+MONS:    firedrake / swamp drake
+MONS:    snake, brown snake, yellow snake
+SUBST:   4 = 34
+SUBST:   3 = 3:20 2
+SUBST:   2 = 2:20 1
+SUBST:   1 = 1.
 SHUFFLE: ab/cd
-SUBST: a = w, b = x, c = x, d = .
+SUBST:   a = w, b = x, c = x, d = .
 SHUFFLE: 123/567
-SUBST: X=x.
-ORIENT: float
+SUBST:   X=x.
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxXW**wXxxxxxxxxxxxxxxX**XXx
@@ -551,9 +557,13 @@ MONS:   elf; robe|leather armour . w:24 quarterstaff|w:1 lajatang|w:75 nothing
 MONS:   ghoul / necrophage / rotting hulk / vampire
 MONS:   wizard / necromancer
 MONS:   big kobold / kobold demonologist
-MONS:   deep elf fighter / w:5 deep elf knight / w:3 deep elf mage / w:2 deep elf priest
-MONS:   Ijyb/Blork the Orc/Urug/Erolcha/Snorg/Terence/Jessica/Sigmund/Psyche/Michael/Erica/Norbert/Agnes/Maud/Louise/Rupert/Wayne/Duane/Norris/goblin
-KITEM:  ! = any potion/potion of confusion, any potion/potion of paralysis, any potion/potion of slowing
+MONS:   deep elf fighter / w:5 deep elf knight / w:3 deep elf mage /\
+        w:2 deep elf priest
+MONS:   Ijyb / Blork the Orc / Urug / Erolcha / Snorg / Terence / Jessica /\
+        Sigmund / Psyche / Michael / Erica / Norbert / Agnes / Maud /\
+        Louise / Rupert / Wayne / Duane / Norris / goblin
+KITEM:  ! = any potion / potion of confusion, \
+            any potion / potion of paralysis, any potion / potion of slowing
 KITEM:  $ = q:132 gold / q:66 gold / q:33 gold
 MAP
 @............... 
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index 66bad0e8a5..b0bbb2ab3a 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -14,9 +14,12 @@ default-depth: D:12-26
 # note that other than the imps, the demons here cannot fly
 NAME:   hellmouth_1
 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
+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
 KFEAT:  A = enter_hell
 ORIENT: float
 SUBST:  d=de, ?:?.l, ?=l.
@@ -50,9 +53,12 @@ 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
+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
 SUBST:  d=de, ?:?.l, ?=l.
 SUBST:  b : b:30 c v .
@@ -83,7 +89,8 @@ ENDMAP
 # Hellmouth 3 (Lemuel)
 NAME:   hellmouth_3
 MONS:   weight:50 imp / quasit / shadow imp / manes / lemure, hell hound
-ITEM:   good_item demon blade / good_item demon whip / good_item demon trident / nothing
+ITEM:   good_item demon blade / good_item demon whip /\
+        good_item demon trident / nothing
 ORIENT: float
 KFEAT:  A = enter_hell
 SUBST:  ? : . l ?:40, ?=l.
@@ -161,6 +168,7 @@ ENDMAP
 
 NAME:   lemuel_mystery_crypt
 DEPTH:  Dis:*
+ORIENT: float
 MONS:   mummy / mummy priest / greater mummy, lich
 NSUBST: 1:1=} / *=1
 NSUBST: 1:1=) / *=1
@@ -168,7 +176,6 @@ NSUBST: 1:1=] / *=1
 SUBST:  = : =+
 SUBST:  }=}>, )=)>, ]=]>
 # occasionally (12.5%), all downstairs are in this vault
-ORIENT: float
 MAP
 xxxxxxxxxxxxxxxxxxxxxxx
 xxFxxxx1.x1x.1xxx2..=1x
diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index 6c2662c053..745403bfe9 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -61,19 +61,19 @@ ENDMAP
 #############################################################################
 # Cooperation Not Competition (Rot)
 #
-NAME: hive_david_3
-TAGS: hive_entry
-ORIENT: float
-ITEM: honeycomb, honeycomb, honeycomb / royal jelly, royal jelly
-MONS: killer bee larva / killer bee, queen bee
-MONS: giant ant / soldier ant, queen ant
-MONS: yellow wasp / nothing, red wasp / yellow wasp
-MONS: bumblebee
+NAME:    hive_david_3
+TAGS:    hive_entry
+ORIENT:  float
+ITEM:    honeycomb, honeycomb, honeycomb / royal jelly, royal jelly
+MONS:    killer bee larva / killer bee, queen bee
+MONS:    giant ant / soldier ant, queen ant
+MONS:    yellow wasp / nothing, red wasp / yellow wasp
+MONS:    bumblebee
 SHUFFLE: XY, VW, defgOR, 34/56
-SUBST: V==, W=a, X==, Y=a
-SUBST: ? = a .:20
-SUBST: 1 : 1 7:2
-SUBST: 7 = 7 .
+SUBST:   V==, W=a, X==, Y=a
+SUBST:   ? = a .:20
+SUBST:   1 : 1 7:2
+SUBST:   7 = 7 .
 MAP
    .......   ...............
    ..??...   ..??aaa?aaa???.
@@ -92,15 +92,16 @@ ENDMAP
 ##############################################################################
 # Bears Won't Share
 #
-NAME: erik_hive_1
-TAGS: hive_entry
-MONS: w:200 bear / polar bear / w:100 grizzly bear / w:100 black bear
-MONS: killer bee, queen bee, killer bee larva
-ITEM: honeycomb, royal jelly
-SUBST: ? = a.
-SUBST: ; = 1:1 .
+NAME:    erik_hive_1
+TAGS:    hive_entry
+ORIENT:  float
+MONS:    w:200 bear / polar bear / w:100 grizzly bear / w:100 black bear
+MONS:    killer bee, queen bee, killer bee larva
+ITEM:    honeycomb, royal jelly
+SUBST:   ? = a.
+SUBST:   ; = 1:1 .
 SHUFFLE: deO
-ORIENT: float
+
 MAP
   ...............  
  ;;;;;...?aaa???.  
@@ -116,12 +117,12 @@ ENDMAP
 ##############################################################################
 # Bucolic
 #
-NAME: erik_hive_2
-TAGS: hive_entry
-MONS: plant, killer bee
-SUBST: 1 = 1.
-SUBST: 2 = 2.
+NAME:   erik_hive_2
+TAGS:   hive_entry
 ORIENT: float
+MONS:   plant, killer bee
+SUBST:  1 = 1.
+SUBST:  2 = 2.
 MAP
  1.....2.......1.1   
  ..1.....1...2..1.   
@@ -177,7 +178,10 @@ NAME:      eino_hive_1
 TAGS:      hive_entry no_monster_gen
 ORIENT:    float
 # i'm not sure water creatures would fit this one.. change if you strongly think otherwise
-MONS:      killer bee / killer bee larva w:2, queen bee / killer bee w:2, oklob plant / plant w:1, plant / nothing
+MONS:      killer bee / killer bee larva w:2
+MONS:      queen bee / killer bee w:2
+MONS:      oklob plant / plant w:1
+MONS:      plant / nothing
 KMONS:     R = killer bee / killer bee larva w:2
 KFEAT:     R = R
 KMONS:     M = plant
@@ -227,7 +231,6 @@ ENDMAP
 
 ##########################################
 # Bees in trees by the pond
-
 NAME:      eino_hive_2
 TAGS:      hive_entry
 ORIENT:    float
@@ -254,9 +257,9 @@ ENDMAP
 # Hive vaults
 ##############################################################################
 
-NAME: Hive_Balancer
-DEPTH: Hive:*
-TAGS: dummy
+NAME:   Hive_Balancer
+DEPTH:  Hive:*
+TAGS:   dummy
 CHANCE: 200
 MAP
 x
@@ -264,7 +267,7 @@ ENDMAP
 # Note the higher weight to the empty vault:
 # this is because vaults in the Hive should be rare
 
-NAME: lemuel_Hive_Pool
+NAME:  lemuel_Hive_Pool
 DEPTH: Hive:*
 SUBST: W=W. ,  ?:W. , !:W.
 MAP
@@ -284,8 +287,8 @@ MAP
         WW
 ENDMAP
 
-NAME: lemuel_Hive_Moat
-DEPTH: Hive:*
+NAME:   lemuel_Hive_Moat
+DEPTH:  Hive:*
 ORIENT: float
 MAP
       www
@@ -302,18 +305,20 @@ MAP
       www
 ENDMAP
 
-NAME: lemuel_Hive_Zombies
-DEPTH: Hive:1-3
-ORIENT: float
-TAGS: no_monster_gen
-MONS: killer bee zombie/weight:2 killer bee larva zombie, necromancer, plant
+NAME:    lemuel_Hive_Zombies
+DEPTH:   Hive:1-3
+ORIENT:  float
+TAGS:    no_monster_gen
+MONS:    killer bee zombie / weight:2 killer bee larva zombie
+MONS:    necromancer
+MONS:    plant
 SHUFFLE: {}
-SUBST: . = .:50 1:4 3:1
-SUBST: > = <>
-SUBST: }=} .:3
-SUBST: {={ .:3
-SUBST: == +:5 = .:3
-SUBST: ? = a.
+SUBST:   . = .:50 1:4 3:1
+SUBST:   > = <>
+SUBST:   }=} .:3
+SUBST:   {={ .:3
+SUBST:   == +:5 = .:3
+SUBST:   ? = a.
 MAP
        aaaaaa
       aa?..?aa
@@ -342,15 +347,15 @@ cccccccaa?.......?aaaa
      aaa
 ENDMAP
 
-NAME: lemuel_Hive_Oklob
+NAME:  lemuel_Hive_Oklob
 DEPTH: Hive:*
-MONS: oklob plant
+MONS:  oklob plant
 MAP
 1
 ENDMAP
 
 NAME: lemuel_Big_Bunch_of_Bees
-MONS: killer bee/weight:1 killer bee larva
+MONS: killer bee / weight:1 killer bee larva
 MAP
       11111
     111111111
@@ -365,14 +370,14 @@ MAP
       11111
 ENDMAP
 
-NAME: lemuel_troublesome_eels
+NAME:  lemuel_troublesome_eels
 DEPTH: Hive:*
 KFEAT: X = deep_water
 KMONS: X = electrical eel
 SUBST: W=w1.
 SUBST: . = 1:1 .
 SUBST: 1 = 1 .:5
-MONS: plant
+MONS:  plant
 MAP
   ....111....  
  ...1111111... 
@@ -389,12 +394,12 @@ MAP
   ....111....  
 ENDMAP
 
-NAME: lemuel_wasp_nest
-DEPTH: Hive:2-3
-MONS: yellow wasp/weight:2 red wasp
+NAME:   lemuel_wasp_nest
+DEPTH:  Hive:2-3
+MONS:   yellow wasp / weight:2 red wasp
 CHANCE: 1
-SUBST: 1=1 .:15
-SUBST: ?=a.
+SUBST:  1=1 .:15
+SUBST:  ?=a.
 MAP
      a?@?a
      a?.?a
@@ -413,8 +418,8 @@ aa?...a.a...?aa
       aaa
 ENDMAP
 
-NAME: lemuel_hive_grid_a
-DEPTH: Hive:*
+NAME:   lemuel_hive_grid_a
+DEPTH:  Hive:*
 CHANCE: 4
 MAP
 a.a.a.a.a.a.a.a.a
@@ -430,8 +435,8 @@ aa.a.a.a.a.a.a.aa
 a.a.a.a.a.a.a.a.a
 ENDMAP
 
-NAME: lemuel_hive_grid_b
-DEPTH: Hive:*
+NAME:   lemuel_hive_grid_b
+DEPTH:  Hive:*
 CHANCE: 6
 MAP
 a.a.a.a.aa
@@ -443,8 +448,8 @@ aa.a.a.a.a
 a.a.a.a.aa
 ENDMAP
 
-NAME: lemuel_hive_grid_c
-DEPTH: Hive:*
+NAME:   lemuel_hive_grid_c
+DEPTH:  Hive:*
 CHANCE: 10
 MAP
      aa.aa
@@ -466,11 +471,11 @@ ENDMAP
 ############################################################################
 # Hive:4 beehive
 #
-NAME: beehive
-PLACE: Hive:4
+NAME:   beehive
+PLACE:  Hive:4
 ORIENT: encompass
-MONS: queen bee, killer bee, killer bee larva, plant, yellow wasp
-MONS: random, random
+MONS:   queen bee, killer bee, killer bee larva, plant, yellow wasp
+MONS:   random, random
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index dab0ce33a7..8d28805a02 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -59,15 +59,17 @@ ENDMAP
 ##############################################################################
 # Lair monsters near stair 
 #
-NAME: david_lair_3
-TAGS: lair_entry
-MONS: w:50 nothing / w:30 giant slug / w:30 giant snail
-MONS: w:100 nothing / w:40 yak / sheep / death yak
-MONS: w:100 nothing / w:20 giant iguana / w:20 giant lizard / gila monster / komodo dragon
-MONS: green rat / grey rat / orange rat / quokka / rat
-MONS: w:90 nothing / w:30 giant frog / blink frog / giant brown frog / spiny frog
+NAME:    david_lair_3
+TAGS:    lair_entry
+ORIENT:  float
+MONS:    w:50 nothing / w:30 giant slug / w:30 giant snail
+MONS:    w:100 nothing / w:40 yak / sheep / death yak
+MONS:    w:100 nothing / w:20 giant iguana / w:20 giant lizard /\
+         gila monster / komodo dragon
+MONS:    green rat / grey rat / orange rat / quokka / rat
+MONS:    w:90 nothing / w:30 giant frog / blink frog / giant brown frog /\
+         spiny frog
 SHUFFLE: 12345
-ORIENT: float
 MAP
 111...@......
 111..........
@@ -113,7 +115,8 @@ ENDMAP
 #
 NAME: erik_lair_2
 TAGS: lair_entry
-MONS: generate_awake boring beetle / nothing / rat, generate_awake boring beetle
+MONS: generate_awake boring beetle / nothing / rat
+MONS: generate_awake boring beetle
 # Rats are boring.
 ORIENT: float
 SUBST: ? = c x $ .
@@ -134,8 +137,9 @@ ENDMAP
 #
 NAME:   erik_lair_3
 TAGS:   lair_entry
-MONS:   w:60 troll / Snorg, w:30 hound / jackal / w:20 war dog
 ORIENT: float
+MONS:   w:60 troll / Snorg
+MONS:   w:30 hound / jackal / w:20 war dog
 SUBST:  ? = w.
 MAP
 .@........wwwwww?.....
@@ -158,13 +162,14 @@ ENDMAP
 ########################################################################
 # Dragon's Lair, for generous values of Dragon
 #
-NAME: erik_lair_4
-TAGS: lair_entry no_rotate
-MONS: steam dragon / mottled dragon / swamp drake
-MONS: w:20 giant iguana / komodo dragon / giant gecko / giant lizard / nothing
-SUBST: ? = x.c
+NAME:    erik_lair_4
+TAGS:    lair_entry no_rotate
+ORIENT:  float
+MONS:    steam dragon / mottled dragon / swamp drake
+MONS:    w:20 giant iguana / komodo dragon / giant gecko / giant lizard / nothing
+SUBST:   ? = x.c
 SHUFFLE: %*RO
-ORIENT: float
+
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxxxx.xxxxxxxxxxxxxxxxxxxxxxx
@@ -184,10 +189,13 @@ ENDMAP
 ##############################################################################
 # Orcish Takeover!
 # 
-NAME: erik_lair_5
-TAGS: lair_entry
-MONS: orc, warg/giant snail, orc warrior/warg, orc priest/orc wizard/plant
+NAME:   erik_lair_5
+TAGS:   lair_entry
 ORIENT: float
+MONS:   orc
+MONS:   warg / giant snail
+MONS:   orc warrior / warg
+MONS:   orc priest / orc wizard / plant
 MAP
 xxxx..@..xxxx
 xx.........xx
@@ -251,11 +259,12 @@ ENDMAP
 #
 NAME:   strawberry_fields_big
 ORIENT: float
+CHANCE: 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
+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
 COLOUR: . = green:20 / brown:15 / none
 MAP
 .....................
@@ -278,11 +287,12 @@ ENDMAP
 
 NAME:   strawberry_fields_big_rounded
 ORIENT: float
+CHANCE: 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
+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
 COLOUR: . = green:20 / brown:15 / none
 MAP
        .......
@@ -305,12 +315,13 @@ ENDMAP
 
 NAME:   strawberry_fields_round
 ORIENT: float
+CHANCE: 4
 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
+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
 COLOUR: . = green:20 / brown:15 / none
 MAP
    ....
@@ -325,11 +336,12 @@ ENDMAP
 
 NAME:   strawberry_fields_patches_spacepadded
 ORIENT: float
+CHANCE: 4
 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
+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
 COLOUR: . = green:20 / brown:15 / none
 MAP
    ..
@@ -358,7 +370,8 @@ DEPTH:  Lair, Snake
 MONS:   plant, fungus
 SUBST:  ' = . a 2:1
 SUBST:  . = .:90 a:10 2:1
-KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 / strawberry q:2 w:5 / lemon
+KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 /\
+            strawberry q:2 w:5 / lemon
 KFEAT:  a = .
 CHANCE: 8
 MAP
@@ -378,7 +391,8 @@ MONS:   plant, fungus
 SUBST:  ' = . 1
 SUBST:  . = .:90 a:10 2:1
 SUBST:  _ = .:90 a:4 
-KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 / strawberry q:2 w:5 / lemon
+KITEM:  a : apple / apricot / pear / orange / banana / strawberry q:1 w:5 /\
+            strawberry q:2 w:5 / lemon
 KFEAT:  a = .
 CHANCE: 2
 MAP
@@ -399,7 +413,7 @@ ENDMAP
 #
 # common version in float.des -evk
 # doesn't work yet?
-
+#
 NAME:    onia_ninara_012_swampy_vault_shoal
 TAGS:    no_pool_fixup no_monster_gen uniq_swamp_vault
 DEPTH:   Shoal
@@ -412,8 +426,10 @@ KFEAT:   F = w:150 w / w:70 W / ~ / . / x
 KFEAT:   G = x / . / w / W
 KFEAT:   H = . / W
 KMONS:   D = Plant / w:200 nothing
-KMONS:   E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
-KMONS:   F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
+KMONS:   E = w:2 slime creature / swamp worm / giant blowfly /\
+             w:2 giant mosquito / w:1 electrical eel / w:1000 nothing
+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
 MAP
@@ -484,10 +500,10 @@ DEPTH:  Lair:5-10
 TAGS:   no_monster_gen mini_float
 : if you.absdepth() >= 18 then
 MONS:   dragon
-MONS:   w:5 firedrake/w:1 mottled dragon/w:2 nothing
+MONS:   firedrake / w:2 mottled dragon / w:4 nothing
 : else
-MONS:   mottled dragon/steam dragon
-MONS:   firedrake/w:15 nothing
+MONS:   mottled dragon / steam dragon
+MONS:   firedrake / w:15 nothing
 : end
 ITEM:   any good_item
 SUBST:  ! = $:3 d:2
@@ -522,9 +538,10 @@ ENDMAP
 NAME:   hibernation_bobbens
 DEPTH:  Lair:5-10
 TAGS:   allow_dup no_monster_gen no_item_gen mini_float
-MONS:   w:5 death drake/ice dragon/dragon/swamp dragon
-MONS:   swamp dragon/hydra/grey snake
-MONS:   swamp drake/w:20 spiny frog/w:20 komodo dragon/w:20 gila monster/w:20 black snake
+MONS:   w:5 death drake / ice dragon / dragon / swamp dragon
+MONS:   swamp dragon / hydra / grey snake
+MONS:   swamp drake / w:20 spiny frog / w:20 komodo dragon /\
+        w:20 gila monster / w:20 black snake
 : if you.absdepth() >= 18 then
 SUBST:  M = 1:1 2:9 3:20
 : elseif you.absdepth() >= 13 then
@@ -548,10 +565,10 @@ ENDMAP
 ###########################
 # Stranded yaks
 #
-NAME: Lemuel_yak_island_a
+NAME:  Lemuel_yak_island_a
 DEPTH: Lair
-TAGS: no_pool_fixup uniq_yak_island
-MONS: yak/w:5 sheep/w:3 death yak
+TAGS:  no_pool_fixup uniq_yak_island
+MONS:  yak / w:5 sheep / w:3 death yak
 SUBST: ; : .wW
 SUBST: . : . W:2
 MAP
@@ -568,10 +585,10 @@ MAP
 ..............
 ENDMAP
 
-NAME: Lemuel_yak_island_b
+NAME:  Lemuel_yak_island_b
 DEPTH: Swamp, Shoal
-TAGS: no_pool_fixup uniq_yak_island
-MONS: yak/w:5 sheep/w:3 death yak
+TAGS:  no_pool_fixup uniq_yak_island
+MONS:  yak / w:5 sheep / w:3 death yak
 SUBST: ; = wW
 SUBST: . : . W:2
 MAP
@@ -596,10 +613,10 @@ ENDMAP
 ##############################################################################
 # Shoals: ranged attackers
 #
-NAME:  Shoal_1
-PLACE: Shoal:5
+NAME:   Shoal_1
+PLACE:  Shoal:5
 CHANCE: 0
-MONS:  cyclops, yaktaur, yaktaur captain
+MONS:   cyclops, yaktaur, yaktaur captain
 MAP
 wwwwwwwwcccccccccccccwwwwwww
 wwwwwcccc...wwwwwwwwcccwwwww
@@ -635,15 +652,15 @@ ENDMAP
 ##############################################################################
 # Shoals: fish
 #
-NAME:  Shoal_2
-PLACE: Shoal:5
+NAME:   Shoal_2
+PLACE:  Shoal:5
 CHANCE: 0
-MONS:  cyclops,stone giant
-SUBST: 1 = 1.
-SUBST: W = W:2 w
-SUBST: . = . w:3
-KMONS: W = giant goldfish/big fish/electrical eel
-KFEAT: W = w
+MONS:   cyclops,stone giant
+SUBST:  1 = 1.
+SUBST:  W = W:2 w
+SUBST:  . = . w:3
+KMONS:  W = giant goldfish/big fish/electrical eel
+KFEAT:  W = w
 MAP
 wwwww......11......wwwww
 www.....1WWWWWW1.....www
@@ -673,11 +690,11 @@ ENDMAP
 ##############################################################################
 # Shoals: statue on rune
 #
-NAME: Shoal_3
-PLACE: Shoal:5
+NAME:   Shoal_3
+PLACE:  Shoal:5
 CHANCE: 0
-KMONS: x:ice statue/orange crystal statue/silver statue
-KFEAT: x:O
+KMONS:  x : ice statue / orange crystal statue / silver statue
+KFEAT:  x : O
 MAP
 x
 ENDMAP
@@ -687,10 +704,10 @@ ENDMAP
 #
 # You may need controlled flight or apportation to get the liquid rune
 #
-NAME:  Shoal_4
-PLACE: Shoal:5
+NAME:   Shoal_4
+PLACE:  Shoal:5
 CHANCE: 0
-KFEAT: O = w
+KFEAT:  O = w
 ### KITEM: O = liquid rune of Zot
 MAP
 ....wwwww....
@@ -712,11 +729,11 @@ ENDMAP
 # Shoal hut with rune inside
 #
 # Shoal:$ is hand-hacked to force lots of minivaults.
-NAME: shoalhut_rune
-PLACE: Shoal:$
-TAGS: has_rune
+NAME:    shoalhut_rune
+PLACE:   Shoal:$
+TAGS:    has_rune
 SHUFFLE: ABCD
-SUBST: A:x, B:x, C:x=, D=+
+SUBST:   A:x, B:x, C:x=, D=+
 MAP
 .xxCxx.
 xx...xx
@@ -731,11 +748,11 @@ ENDMAP
 # Shoal hut with no rune inside
 #
 # Shoal:$ is hand-hacked to force lots of minivaults.
-NAME: shoalhut_norune
-PLACE: Shoal:$
-TAGS: allow_dup
+NAME:    shoalhut_norune
+PLACE:   Shoal:$
+TAGS:    allow_dup
 SHUFFLE: ABCD
-SUBST: A:x, B:x, C:x=, D=+
+SUBST:   A:x, B:x, C:x=, D=+
 MAP
 .xxCxx.
 xx...xx
@@ -752,7 +769,9 @@ ENDMAP
 NAME:    slime_pit
 PLACE:   Slime:6
 ORIENT:  encompass
-MONS:    royal jelly, acid blob, great orb of eyes / nothing
+MONS:    royal jelly
+MONS:    acid blob
+MONS:    great orb of eyes / nothing
 SUBST:   ' : ' .:1,  ' : ' x:1,  ' = .x
 SUBST:   " : " .:3,  " = .c
 NSUBST:  P = O / *|
@@ -842,8 +861,11 @@ FLAGS:   no_rotate
 ORIENT:  northwest
 KFEAT:   Z = weight:2 teleport trap / .
 KFEAT:   z = teleport trap / Zot trap / weight:20 .
-MONS:    naga / nothing, greater naga / nothing, guardian naga / nothing
-MONS:    naga warrior / nothing, naga mage / nothing
+MONS:    naga / nothing
+MONS:    greater naga / nothing
+MONS:    guardian naga / nothing
+MONS:    naga warrior / nothing
+MONS:    naga mage / nothing
 MONS:    greater naga / guardian naga
 SHUFFLE: 'X / "Y
 SHUFFLE: 'X / 'X / AB, "Y / CD
@@ -904,7 +926,10 @@ NAME:   snake_pit
 PLACE:  Snake:5
 ORIENT: southwest
 FLAGS:  no_rotate
-MONS:   greater naga / nothing, naga, naga mage / nothing, naga warrior / nothing
+MONS:   greater naga / nothing
+MONS:   naga
+MONS:   naga mage / nothing
+MONS:   naga warrior / nothing
 SUBST:  c = c .:1
 SUBST:  v = v .:1
 SUBST:  v = x
@@ -953,7 +978,9 @@ NAME:    swamp
 PLACE:   Swamp:5
 ORIENT:  southeast
 FLAGS:   no_rotate
-MONS:    swamp dragon / nothing, swamp drake / nothing, hydra / nothing
+MONS:    swamp dragon / nothing
+MONS:    swamp drake / nothing
+MONS:    hydra / nothing
 SHUFFLE: 12
 SUBST:   ' = xc
 # NB - most of the 'x's here will be set to water in dungeon.cc
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index de922d39b6..6f547b7edd 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -181,7 +181,8 @@ SUBST:   T = .:50 ~
 SUBST:   | : |:30 Z
 SUBST:   ! = =+x
 KFEAT:   Z = floor
-KMONS:   Z = hill giant zombie/stone giant zombie/cyclops zombie/titan zombie
+KMONS:   Z = hill giant zombie / stone giant zombie / cyclops zombie /\
+             titan zombie
 KFEAT:   ( = . w:25 / ~
 KITEM:   ( = any weapon good_item
 KMONS:   8 = plant
@@ -233,20 +234,33 @@ SUBST:  A=x , a=+
 SUBST:  g = 1 2:3 3:1 4:3
 SUBST:  G = 1 2:3 3:1 4:3
 MONS:   gnoll
-MONS:   gnoll ; potion of healing . halberd | glaive | whip ego:reaching w:2 | spear | spear ego:reaching w:2 . ring mail | scale mail
-MONS:   gnoll ; potion of healing | potion of heal wounds . whip ego:reaching w:2 | whip good_item no_uniq w:1 | spear ego:reaching w:2 | glaive . scale mail | chain mail
-MONS:   gnoll ; javelin q:3 | throwing net q:2 . spear | halberd . leather armour | ring mail
+MONS:   gnoll ; potion of healing . halberd | glaive | whip ego:reaching w:2 | \
+                spear | spear ego:reaching w:2 . ring mail | scale mail
+MONS:   gnoll ; potion of healing | potion of heal wounds . \
+                whip ego:reaching w:2 | whip good_item no_uniq w:1 | \
+                spear ego:reaching w:2 | glaive . scale mail | chain mail
+MONS:   gnoll ; javelin q:3 | throwing net q:2 . spear | halberd . \ 
+                leather armour | ring mail
 # juggle positions of the rest of the population and remove placeholders
 SHUFFLE: M/m, H/h, F/f, S/s, B/b, W/w, Z/z, D/d
 SUBST:  m=. , h=. , f=. , s=. , b=. , w=. , z=., d=.
-KMONS:  M = gnoll ; whip | whip ego:reaching w:2 | spear ego:reaching w:2 . leather armour | ring mail
+KMONS:  M = gnoll ; whip | whip ego:reaching w:2 | spear ego:reaching w:2 . \
+                    leather armour | ring mail
 KMONS:  H = jackal / hound
-KMONS:  B = gnoll ; potion of healing | potion of heal wounds . whip ego:reaching w:2 | whip good_item no_uniq w:1 | spear ego:reaching w:2 |glaive . scale mail | chain mail / w:4 gnoll ; potion of heal wounds . spear good_item | halberd good_item | glaive ego:reaching w:5 .chain mail | banded mail
+KMONS:  B = gnoll ; potion of healing | potion of heal wounds . \
+                    whip ego:reaching w:2 | whip good_item no_uniq w:1 | \
+                    spear ego:reaching w:2 |glaive . scale mail | chain mail / \
+        w:4 gnoll ; potion of heal wounds . spear good_item | \
+                    halberd good_item | glaive ego:reaching w:5 .chain mail | \
+                    banded mail
 KITEM:  F = meat ration / beef jerky / sausage / potion of water
-KITEM:  S = javelin q:4 w:5 / javelin q:3 w:5 / cloak / sausage / potion of water / leather armour / pair of gloves / hand axe
-KITEM:  W = spear good_item no_uniq w:2 / halberd / glaive / javelin q:4 w:5 / javelin q:3 w:5 / throwing net
+KITEM:  S = javelin q:4 w:5 / javelin q:3 w:5 / cloak / sausage /\
+            potion of water / leather armour / pair of gloves / hand axe
+KITEM:  W = spear good_item no_uniq w:2 / halberd / glaive / javelin q:4 w:5 /\
+            javelin q:3 w:5 / throwing net
 KFEAT:  Z = $
-KITEM:  D = potion of confusion / potion of speed / potion of berserk rage / potion of might
+KITEM:  D = potion of confusion / potion of speed / potion of berserk rage /\
+            potion of might
 MAP
 xxxxxxxxxxxxxxxxxxxxxxx
 xxxxxxxxxxxxxxxxxxxxxxx
@@ -276,25 +290,30 @@ DEPTH:  D:3-27
 ORIENT: northwest
 TAGS:   no_monster_gen no_rotate
 : if you.absdepth() < 7 then
-MONS: gnoll, gnoll, ogre, jackal
-SUBST: *=*. , *=$ , |=* , *=*.
+MONS:   gnoll, gnoll, ogre, jackal
+SUBST:  *=*. , *=$ , |=* , *=*.
 : elseif you.absdepth() < 16 then
-MONS: orc, w:5 orc knight / orc warrior
-MONS: orc sorcerer / orc warlord / orc knight, warg
-SUBST: *:*$ , |:*$
+MONS:   orc, w:5 orc knight / orc warrior
+MONS:   orc sorcerer / orc warlord / orc knight, warg
+SUBST:  *:*$ , |:*$
 : elseif you.absdepth() < 25 then
-MONS: deep elf soldier / deep elf fighter
-MONS: deep elf knight / deep elf mage / deep elf summoner / deep elf priest
-MONS: deep elf annihilator / deep elf sorcerer / deep elf demonologist / deep elf blademaster/deep elf master archer
-MONS: nothing
-SUBST: *:*$, |=|.
+MONS:   deep elf soldier / deep elf fighter
+MONS:   deep elf knight / deep elf mage / deep elf summoner / deep elf priest
+MONS:   deep elf annihilator / deep elf sorcerer / deep elf demonologist /\
+        deep elf blademaster/deep elf master archer
+MONS:   nothing
+SUBST:  *:*$, |=|.
 : else
-MONS: red draconian/green draconian/yellow draconian/pale draconian/black draconian/purple draconian
-MONS: pale draconian knight/green draconian annihilator/purple draconian knight
-MONS: red draconian scorcher/white draconian zealot/yellow draconian caller/black draconian shifter
-MONS: lindwurm/death drake/swamp drake, plant/weight:1 oklob plant
-SUBST: w:wl
-SUBST: *:*$
+MONS:   red draconian / green draconian / yellow draconian / pale draconian /\
+        black draconian / purple draconian
+MONS:   pale draconian knight / green draconian annihilator /\
+        purple draconian knight
+MONS:   red draconian scorcher / white draconian zealot /\
+        yellow draconian caller / black draconian shifter
+MONS:   lindwurm / death drake / swamp drake
+MONS:   plant / w:1 oklob plant
+SUBST:  w:wl
+SUBST:  *:*$
 : end
 COLOUR: ? = brown
 SUBST:  ? = .
@@ -356,12 +375,15 @@ SUBST:   3 = 3:20 .
 #KFEAT:   ! = amnesia trap
 KFEAT:   ! = ^
 MONS:    plant
-MONS:    wolf/warg/hell hound
+MONS:    wolf / warg / hell hound
 MONS:    nothing
-MONS:    wight w:50/wraith/shadow wraith/spectral warrior/skeletal warrior/flayed ghost
+MONS:    wight w:50 / wraith / shadow wraith / spectral warrior /\
+         skeletal warrior / flayed ghost
 MONS:    dancing weapon
-MONS:    human simulacrum w:60/elf simulacrum/ogre simulacrum/centaur simulacrum/troll simulacrum/vampire/wraith/hungry ghost
-MONS:    eye of draining/brain worm/death drake w:5/shadow/shadow dragon w:1
+MONS:    human simulacrum w:60 / elf simulacrum / ogre simulacrum /\
+         centaur simulacrum / troll simulacrum / vampire / wraith / hungry ghost
+MONS:    eye of draining / brain worm / death drake w:5 / shadow /\
+         shadow dragon w:1
 KITEM:   A = potion of experience / any good_item
 KMONS:   A = Maud
 KFEAT:   A = >
@@ -1077,7 +1099,8 @@ ITEM:    scroll of teleportation
 KFEAT:   T = teleport trap
 KMONS:   w = electrical eel / jellyfish / nothing w:120
 KFEAT:   w = w
-KMONS:   l = fire vortex / lava snake / lava fish / fire elemental w:1 / nothing w:50
+KMONS:   l = fire vortex / lava snake / lava fish / fire elemental w:1 /\
+             nothing w:50
 KFEAT:   l = l
 KMONS:   z = killer bee
 KMONS:   Z = bumblebee
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 58d7cff598..ee00806898 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -177,8 +177,8 @@ ENDMAP
 #
 NAME:    elves_outpost_lemuel
 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
+MONS:    deep elf soldier / w:4 deep elf fighter
+MONS:    w:20 deep elf mage / deep elf conjurer / deep elf summoner
 SHUFFLE: ?:/bb, :;/ww
 SUBST:   ?=., :=., ;=.
 MAP
@@ -225,9 +225,9 @@ TAGS:  uniq_gnoll_camp
 MONS:  gnoll
 # "gnoll seargeant" with guaranteed good gear
 MONS:  gnoll ; potion of healing | potion of heal wounds \ 
-    . whip ego:reaching |whip good_item no_uniq | spear ego:reaching \
-        | glaive \
-    . scale mail | chain mail
+             . whip ego:reaching |whip good_item no_uniq | \
+               spear ego:reaching | glaive \
+             . scale mail | chain mail
 MONS: jackal / hound
 MAP
 xxxxxxxxxx
@@ -247,7 +247,9 @@ DEPTH: D:3-10
 TAGS:  uniq_gnoll_camp
 MONS:  gnoll
 # "gnoll seargeant" with guaranteed good gear
-MONS:  gnoll ; potion of healing | potion of heal wounds . whip ego:reaching |whip good_item no_uniq | spear ego:reaching | glaive . scale mail | chain mail
+MONS:  gnoll ; potion of healing | potion of heal wounds \
+             . whip ego:reaching |whip good_item no_uniq | \
+               spear ego:reaching | glaive . scale mail | chain mail
 MONS:  jackal / hound
 MAP
 xxxxxxxxxx
@@ -267,11 +269,11 @@ ENDMAP
 #############################################################################
 # Centaur isle (Lemuel)
 #
-NAME: centaur_isle
-TAGS: no_monster_gen no_pool_fixup no_rotate
+NAME:  centaur_isle
+TAGS:  no_monster_gen no_pool_fixup no_rotate
 SUBST: ? = *$
 DEPTH: D:6-12, Shoal
-MONS: centaur
+MONS:  centaur
 MAP
           wwww
        wwwwwwww
@@ -300,9 +302,10 @@ TAGS:  no_pool_fixup no_monster_gen
 SUBST: T = TU
 SUBST: W = w:20 W .:5
 MONS:  ice statue
-MONS:  ice devil w:5/blue devil w:5/ice dragon/freezing wraith/nothing w:30
-MONS:  white imp/ice beast w:30/polar bear/nothing w:50
-MONS:  white imp/ice beast w:30/polar bear/nothing w:50
+MONS:  ice devil w:5 / blue devil w:5 / ice dragon / freezing wraith /\ 
+       nothing w:30
+MONS:  white imp / ice beast w:30 / polar bear / nothing w:50
+MONS:  white imp / ice beast w:30 / polar bear / nothing w:50
 KFEAT: 2 = >
 KFEAT: 4 = >
 SUBST: | = ||****%%%% 
@@ -1354,8 +1357,8 @@ ENDMAP
 #
 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:  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
@@ -1542,12 +1545,12 @@ ENDMAP
 NAME:   sword_in_stone
 TAGS:   mini_float patrolling
 DEPTH:  5-26, !Lair, !Orc, !Tomb
-NSUBST: k= 4=k / *= .:19 k:1
-KITEM:  S= good_item long sword/ good_item great sword / w:1 good_item katana
-KFEAT:  S= teleport trap
-NSUBST: n= n/cbn
+NSUBST: k = 4=k / *= .:19 k:1
+KITEM:  S = good_item long sword / good_item great sword / w:1 good_item katana
+KFEAT:  S = teleport trap
+NSUBST: n = n/cbn
 : if you.absdepth() < 10 then
-SUBST: k= AWXYZ
+SUBST: k = AWXYZ
 : elseif you.absdepth() < 13 then
 SUBST: k = ABCDE
 : elseif you.absdepth() < 16 then
@@ -1555,29 +1558,29 @@ SUBST: k = CDEFG
 : elseif you.absdepth() < 19 then
 SUBST: k = FGHIJ
 : elseif you.absdepth() < 22 then
-SUBST: k= HIJKL
+SUBST: k = HIJKL
 : else
-SUBST: k =KLMNO
+SUBST: k = KLMNO
 : end
-KMONS: A=Blork the Orc / human; long sword|falchion . chain mail . shield
-KMONS: B=Michael / human; great sword . banded mail|plate mail
-KMONS: C=Urug / elf; sabre|long sword . leather armour . buckler|nothing
-KMONS: D=Joseph / elf; long sword|scimitar . chain mail . shield
-KMONS: E=Erica / orc knight
-KMONS: F=Harold / orc knight
-KMONS: G=Norbert / hell knight
-KMONS: H=Jozef / hell knight
-KMONS: I=Louise / wizard; long sword . robe|leather armour . shield
-KMONS: J=Maud / necromancer; great sword . robe|leather armour
-KMONS: K=Frances / deep elf knight
-KMONS: L=Francis / deep elf knight
-KMONS: M=Rupert / vampire knight
-KMONS: N=Wayne / vault guard
-KMONS: O=Frederick / draconian knight
-KMONS: W= human; short sword . banded mail|chain mail . large shield
-KMONS: X= human; scimitar . scale mail|chain mail . shield
-KMONS: Y= human; sabre|long sword . robe|leather armour . buckler|nothing
-KMONS: Z= orc; falchion|long sword . ring mail|scale mail . shield|nothing
+KMONS: A = Blork the Orc / human; long sword | falchion . chain mail . shield
+KMONS: B = Michael / human; great sword . banded mail|plate mail
+KMONS: C = Urug / elf; sabre | long sword . leather armour . buckler | nothing
+KMONS: D = Joseph / elf; long sword | scimitar . chain mail . shield
+KMONS: E = Erica / orc knight
+KMONS: F = Harold / orc knight
+KMONS: G = Norbert / hell knight
+KMONS: H = Jozef / hell knight
+KMONS: I = Louise / wizard; long sword . robe | leather armour . shield
+KMONS: J = Maud / necromancer; great sword . robe | leather armour
+KMONS: K = Frances / deep elf knight
+KMONS: L = Francis / deep elf knight
+KMONS: M = Rupert / vampire knight
+KMONS: N = Wayne / vault guard
+KMONS: O = Frederick / draconian knight
+KMONS: W = human; short sword . banded mail | chain mail . large shield
+KMONS: X = human; scimitar . scale mail|chain mail . shield
+KMONS: Y = human; sabre | long sword . robe | leather armour . buckler | nothing
+KMONS: Z = orc; falchion | long sword . ring mail | scale mail . shield | nothing
 MAP
 kkkkkkk
 kkkkkkk
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index ddb14e6974..69a90229dd 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -180,16 +180,19 @@ ENDMAP
 ##############################################################################
 # Caught partying
 #
-NAME:  erik_orc_1
-TAGS:  orc_entry no_rotate
-MONS:  orc, orc priest/orc wizard, weight:50 orc warrior/ogre, swamp drake
+NAME:    erik_orc_1
+TAGS:    orc_entry no_rotate
+ORIENT:  float
+MONS:    orc, orc priest / orc wizard
+MONS:    w: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
-KFEAT: 1 = 1
-ITEM:  club, potion of confusion, slice of pizza, sausage / weight:40 nothing
-ITEM:  potion of confusion / potion of water
+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
+KFEAT:   1 = 1
+ITEM:    club, potion of confusion, slice of pizza, sausage / weight:40 nothing
+ITEM:    potion of confusion / potion of water
 SHUFFLE: defO
-ORIENT: float
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 x.........g..........2x...w4xxx
@@ -205,17 +208,17 @@ ENDMAP
 ##############################################################################
 # C'mon, you *gotta* have a *fort*!
 #
-NAME: erik_orc_2
-TAGS: orc_entry no_pool_fixup no_rotate
-MONS: orc warrior, orc priest/orc wizard, weight:100 orc / orc warrior
+NAME:  erik_orc_2
+TAGS:  orc_entry no_pool_fixup no_rotate
+ORIENT: float
+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
 SUBST: G = .
 : else
-MONS: orc warrior
+MONS:  orc warrior
 SUBST: G = 4
 : end
-ORIENT: float
 SUBST: c = c:1000 x
 MAP
 .............................
@@ -239,7 +242,7 @@ ENDMAP
 #
 NAME:   erik_orc_3
 TAGS:   orc_entry no_item_gen
-MONS:   orc / weight:2 goblin / weight:2 hobgoblin / nothing
+MONS:   orc / w:2 goblin / w:2 hobgoblin / nothing
 MONS:   orc warrior / orc priest / orc wizard / nothing
 MONS:   warg / ogre / nothing
 ORIENT: float
@@ -271,8 +274,11 @@ ENDMAP
 #
 NAME: erik_orc_4
 TAGS: orc_entry no_rotate
-MONS: human/goblin/hobgoblin/weight:2 orc, orc priest, orc
-MONS: orc priest/orc wizard/weight:2 goblin/nothing, orc warrior/warg
+MONS: human / goblin / hobgoblin / w:2 orc
+MONS: orc priest
+MONS: orc
+MONS: orc priest / orc wizard / w:2 goblin / nothing
+MONS: orc warrior / warg
 ORIENT: float
 SUBST: ? : c:60 .
 SUBST: Z : c:60 .
@@ -307,12 +313,12 @@ ENDMAP
 #########################
 # Orcs are a clue, episode I
 #
-NAME: hiddenorc1_lemuel
-TAGS: orc_entry
+NAME:   hiddenorc1_lemuel
+TAGS:   orc_entry
 ORIENT: float
-MONS: orc w:40/orc wizard w:2/orc priest w:2, orc warrior
-SUBST: ? = .x
-SUBST: ! : .$
+MONS:   orc w:40 / orc wizard w:2 / orc priest w:2, orc warrior
+SUBST:  ? = .x
+SUBST:  ! : .$
 MAP
 x??@....@....@??x
 xx??.........??xx
@@ -331,16 +337,16 @@ ENDMAP
 #########################
 # Orcs are a clue, episode II
 #
-NAME: hiddenorc2_lemuel
-TAGS: orc_entry
+NAME:   hiddenorc2_lemuel
+TAGS:   orc_entry
 ORIENT: float
-MONS: orc w:20/orc wizard w:2/orc priest w:2/orc warrior w:1
-SUBST: a : x.
-SUBST: b : x.
-SUBST: c : x.
-SUBST: d : x.
-SUBST: ? = @ x:20 + =
-SUBST: ! : .$
+MONS:   orc w:20 / orc wizard w:2 / orc priest w:2 / orc warrior w:1
+SUBST:  a : x.
+SUBST:  b : x.
+SUBST:  c : x.
+SUBST:  d : x.
+SUBST:  ? = @ x:20 + =
+SUBST:  ! : .$
 MAP
 xx?xxxxxxx?xx
 x111xxxxx111x
@@ -360,13 +366,15 @@ ENDMAP
 #######################
 # Haunted orc entrance
 #
-NAME: zombieorc1_lemuel
-TAGS: orc_entry
+NAME:   zombieorc1_lemuel
+TAGS:   orc_entry
 ORIENT: float
-DEPTH: 11
-MONS: orc zombie/orc skeleton w:2/goblin zombie w:2/hobgoblin zombie w:2/goblin skeleton w:1/hobgoblin skeleton w:1
-MONS: ogre zombie/troll zombie w:3/hill giant zombie w:1
-MONS: hungry ghost/phantom/w:1 wraith, w:1 orc sorcerer/orc priest/nothing
+DEPTH:  11
+MONS:   orc zombie / orc skeleton w:2 / goblin zombie w:2 /\
+        hobgoblin zombie w:2 / goblin skeleton w:1 / hobgoblin skeleton w:1
+MONS:   ogre zombie / troll zombie w:3 / hill giant zombie w:1
+MONS:   hungry ghost / phantom / w:1 wraith
+MONS:   w:1 orc sorcerer / orc priest / nothing
 SUBST:  ? = x . $:1
 MAP
 xxx.xxxxxxxxxxxxxxxxxxx
@@ -393,15 +401,17 @@ ENDMAP
 #######################
 # Haunted orc entrance
 #
-NAME: zombieorc2_lemuel
-TAGS: orc_entry
+NAME:   zombieorc2_lemuel
+TAGS:   orc_entry
 ORIENT: float
-MONS: orc zombie/orc skeleton w:2/goblin zombie w:2/hobgoblin zombie w:2/goblin skeleton w:1/hobgoblin skeleton w:1
-MONS: ogre zombie/troll zombie w:3/hill giant zombie w:1
-MONS: hungry ghost/phantom/w:1 wraith, w:1 orc sorcerer/orc priest
-SUBST: 4 = 34
-SUBST: ? = x . $:1
-DEPTH: 11
+DEPTH:  11
+MONS:   orc zombie / orc skeleton w:2 / goblin zombie w:2 /\
+        hobgoblin zombie w:2 / goblin skeleton w:1 / hobgoblin skeleton w:1
+MONS:   ogre zombie / troll zombie w:3 / hill giant zombie w:1
+MONS:   hungry ghost / phantom / w:1 wraith
+MONS:   w:1 orc sorcerer / orc priest
+SUBST:  4 = 34
+SUBST:  ? = x . $:1
 MAP
 xxxxx..@..xxxxx
 x21....I....12x
@@ -435,14 +445,14 @@ ENDMAP
 
 ###################################
 # mage tower -- either orc with assistants, or ogre with guards
-NAME: mines4_lemuel
-TAGS: mini_float no_rotate
-SUBST: ? = +=
-SUBST: d = $d
-SUBST: I = IG
+NAME:    mines4_lemuel
+TAGS:    mini_float no_rotate
+SUBST:   ? = +=
+SUBST:   d = $d
+SUBST:   I = IG
 SHUFFLE: 112/334
-MONS: orc sorcerer, orc/orc wizard, ogre-mage, ogre/nothing
-ITEM: any book
+MONS:    orc sorcerer, orc / orc wizard, ogre-mage, ogre / nothing
+ITEM:    any book
 MAP
   xxxx?xxxx
  xx2.....2xx
@@ -457,10 +467,10 @@ ENDMAP
 
 ###################################
 # warg stables, with goblin stableboy
-NAME: mines5_lemuel
-TAGS: mini_float
+NAME:  mines5_lemuel
+TAGS:  mini_float
 SUBST: ?: wx
-MONS: warg/wolf,goblin
+MONS:  warg / wolf,goblin
 MAP
 x???????x
 xwwwwwwwx
@@ -493,7 +503,7 @@ ENDMAP
 
 ###################################
 # Beogh 2
-NAME:  mines2_david
+NAME:   mines2_david
 TAGS:   allow_dup
 KFEAT:  C = altar_beogh
 MONS:   orc / orc warrior w:1
@@ -525,12 +535,12 @@ ENDMAP
 ###################################
 # treasure chamber with oklob plant
 #
-NAME: mines3_lemuel
-TAGS: mini_float
+NAME:  mines3_lemuel
+TAGS:  mini_float
 SUBST: ? = +=.
 SUBST: ! = x.
 SUBST: $ = $:30 *
-MONS: oklob plant
+MONS:  oklob plant
 MAP
     !.!
    !x?x!
@@ -557,7 +567,8 @@ SUBST:   6 : 6 .
 NSUBST:  0 = 3=9. / *=0.
 SUBST:   X = xx. b:2 I:1 $:1 *:1
 MONS:    patrolling orc warlord
-MONS:    patrolling orc sorcerer, patrolling orc high priest
+MONS:    patrolling orc sorcerer
+MONS:    patrolling orc high priest
 MONS:    deep elf fighter / deep elf summoner / deep elf conjurer / deep elf priest
 MONS:    deep elf soldier / deep elf mage / deep elf priest
 MONS:    deep elf soldier
diff --git a/crawl-ref/source/dat/pan.des b/crawl-ref/source/dat/pan.des
index 6a7593d633..835dafb5fd 100644
--- a/crawl-ref/source/dat/pan.des
+++ b/crawl-ref/source/dat/pan.des
@@ -398,18 +398,18 @@ ENDMAP
 
 ###################################
 
-NAME: lemuel_draining_boxes
-TAGS: pan
-MONS: pandemonium demon, eye of draining, any demon
+NAME:    lemuel_draining_boxes
+TAGS:    pan
+MONS:    pandemonium demon, eye of draining, any demon
 SHUFFLE: aA/bB/cC/dD/eE/fF, eE/gG, fF/hH
-SUBST: a=m, b=m, c=m, d=m, e=m, f=m, g=., h=.
-SUBST: A=2, B=2, C=2, D=2, E=2, F=2, G=., H=.
+SUBST:   a=m, b=m, c=m, d=m, e=m, f=m, g=., h=.
+SUBST:   A=2, B=2, C=2, D=2, E=2, F=2, G=., H=.
 # the two center boxes are granted; 
 # of the six outer boxes, one or two may be missing
-SUBST: n=n =:1
-SUBST: m:mn
-KMONS: O = eye of draining
-KFEAT: O = O
+SUBST:   n=n =:1
+SUBST:   m:mn
+KMONS:   O = eye of draining
+KFEAT:   O = O
 MAP
                   ....bbb..  
 .......           ....bBb..  
@@ -435,14 +435,14 @@ ENDMAP
 
 ###################################
 
-NAME: lemuel_hellion_island
-TAGS: pan
-MONS: pandemonium demon, hellion
+NAME:  lemuel_hellion_island
+TAGS:  pan
+MONS:  pandemonium demon, hellion
 SUBST: L=l.
 MAP
-    ..LlllL..    
-  ..LlllllllL..  
- .LlllllllllllL. 
+    ..LlllL..
+  ..LlllllllL..
+ .LlllllllllllL.
 .LlllllL2LlllllL.
 .LllllL2.2LllllL.
 LllllL2|2|2LllllL
@@ -451,20 +451,20 @@ llllL.2|2|2.Lllll
 LllllL.2.2.LllllL
 .LllllL.2.LllllL.
 .LlllllLLLlllllL.
- .LlllllllllllL. 
-  ..LlllllllL..  
-    ..LlllL..    
+ .LlllllllllllL.
+  ..LlllllllL.
+    ..LlllL..
 ENDMAP
 
 ###################################
 
-NAME: lemuel_hall_of_pain
-TAGS: pan
-MONS: pandemonium demon, any demon
-MONS: smoke demon / weight:1 fiend
+NAME:    lemuel_hall_of_pain
+TAGS:    pan
+MONS:    pandemonium demon, any demon
+MONS:    smoke demon / weight:1 fiend
 SHUFFLE: mx/nc
 SHUFFLE: O1/AB
-SUBST: A=|, B=|
+SUBST:   A=|, B=|
 # has a rune!
 MAP
 .......@.......
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index a0a0f5c6ce..cebc3bb855 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -10,11 +10,11 @@
 ##############################################################################
 # hall with pillars
 #
-NAME: temple_hall_a
-TAGS: temple_entry
+NAME:   temple_hall_a
+TAGS:   temple_entry
 CHANCE: 9
 ORIENT: float
-SUBST: ? : c:20 x v b G:5
+SUBST:  ? : c:20 x v b G:5
 MAP
 ccccccccc
 c...O...c
@@ -33,11 +33,11 @@ c.......c
 c@..@..@c
 ENDMAP
 
-NAME: temple_hall_b
-TAGS: temple_entry no_pool_fixup no_monster_gen
+NAME:   temple_hall_b
+TAGS:   temple_entry no_pool_fixup no_monster_gen
 CHANCE: 1
 ORIENT: float
-SUBST: ? : v b G:5
+SUBST:  ? : v b G:5
 MAP
    ccc
    cOc
@@ -61,10 +61,10 @@ ENDMAP
 ##############################################################################
 # stairs with fountains
 #
-NAME: temple_fountains
-TAGS: temple_entry
+NAME:   temple_fountains
+TAGS:   temple_entry
 ORIENT: float
-SUBST: ? : T:30 U
+SUBST:  ? : T:30 U
 MAP
 ...?...
 .......
@@ -76,8 +76,8 @@ ENDMAP
 ##############################################################################
 # stairs with statues
 #
-NAME: temple_statues
-TAGS: temple_entry
+NAME:   temple_statues
+TAGS:   temple_entry
 ORIENT: float
 MAP
 GOG
@@ -86,10 +86,10 @@ ENDMAP
 ##############################################################################
 # the green room
 #
-NAME: temple_green
-TAGS: temple_entry
+NAME:   temple_green
+TAGS:   temple_entry
 ORIENT: float
-SUBST: ? = =+b
+SUBST:  ? = =+b
 MAP
 bbbb+bbbb
 b.......b
@@ -241,15 +241,15 @@ ENDMAP
 ##############################################################################
 # The garden of good and evil
 #
-NAME: temple_garden
-TAGS: temple_entry no_monster_gen
+NAME:   temple_garden
+TAGS:   temple_entry no_monster_gen
 ORIENT: float
-SUBST: . = .:900 3:30 G:5 T U:5 V:5
-SUBST: ' = .:300 3:30 G:5 T U:5 V:5
-SUBST: ! = .:200 3:30 G:5 T U:5 V:5
-SUBST: ? = .:100 3:30 G:5 T U:5 V:5
-SUBST: _=3., -=l.
-MONS: angel, iron devil, plant
+SUBST:  . = .:900 3:30 G:5 T U:0 V:5
+SUBST:  ' = .:300 3:30 G:5 T U:1 V:5
+SUBST:  ! = .:200 3:30 G:5 T U:2 V:5
+SUBST:  ? = .:100 3:30 G:5 T U:5 V:5
+SUBST:  _=3., -=l.
+MONS:   angel, iron devil, plant
 MAP
             ............................xxxxxxxx
         .............'''''...............-llxxxx
@@ -534,7 +534,6 @@ ENDMAP
 
 ##########################################################################
 # Five rooms temple (David Ploog). 12 + 3 = 5 x 3
-
 NAME:    five_temple
 PLACE:   Temple
 TAGS:    no_rotate
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index a4e68474b8..f50f8dd7b0 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -92,15 +92,17 @@ 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
-MONS: deep troll / iron troll / rock troll / troll
-MONS: cyclops / ettin / fire giant / frost giant / hill giant / stone giant / titan
-MONS: necromancer / shapeshifter / vault guard / wizard
-MONS: nothing
-MONS: shapeshifter / weight:30 nothing
-SUBST: 1=.1, 2=.2, 3=.3, 4=.4, 5=.5, *:*.%
-SUBST: x : xcv
+MONS:    dragon / golden dragon / ice dragon / iron dragon / shadow dragon /\
+         storm dragon
+MONS:    freezing wraith / shadow wraith / wight / wraith
+MONS:    deep troll / iron troll / rock troll / troll
+MONS:    cyclops / ettin / fire giant / frost giant / hill giant /\
+         stone giant / titan
+MONS:    necromancer / shapeshifter / vault guard / wizard
+MONS:    nothing
+MONS:    shapeshifter / weight:30 nothing
+SUBST:   1=.1, 2=.2, 3=.3, 4=.4, 5=.5, *:*.%
+SUBST:   x : xcv
 MAP
 @..........@
 .xxxxxxxxxx.
@@ -120,10 +122,10 @@ ENDMAP
 NAME:   david_vaults_5
 TAGS:   vault_entry
 ORIENT: float
-SUBST: ! : ! .
-SUBST: ? : ? .
-SUBST: ? = .:30 0:10 9:4 8:1 %:10 *:4 |:1
-SUBST: ! = .:30 0:10 9:4 8:1 %:10 *:4 |:1
+SUBST:  ! : ! .
+SUBST:  ? : ? .
+SUBST:  ? = .:30 0:10 9:4 8:1 %:10 *:4 |:1
+SUBST:  ! = .:30 0:10 9:4 8:1 %:10 *:4 |:1
 MAP
 xxxxxxxxxxxxxx
 xOx!x!x?x!x?xx
@@ -140,10 +142,10 @@ ENDMAP
 ##############################################################################
 # The Guard of Blades
 # 
-NAME: erik_vaults_1
-TAGS: vault_entry
-MONS: dancing weapon
-ORIENT: float
+NAME:    erik_vaults_1
+TAGS:    vault_entry
+MONS:    dancing weapon
+ORIENT:  float
 SHUFFLE: vcxxx 
 MAP
 .............
@@ -160,10 +162,10 @@ ENDMAP
 ##############################################################################
 # Above As Below
 # 
-NAME: erik_vaults_2
-TAGS: vault_entry
-MONS: vault guard
-ORIENT: float
+NAME:    erik_vaults_2
+TAGS:    vault_entry
+MONS:    vault guard
+ORIENT:  float
 SHUFFLE: vxxx, bcc
 MAP
 vvvvvv.vvvvvv
diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des
index f075a7aaf1..f21af392e3 100644
--- a/crawl-ref/source/dat/zot.des
+++ b/crawl-ref/source/dat/zot.des
@@ -8,7 +8,6 @@
 #
 # Zot petite vaults
 #
-
 NAME:   lemuel_baited_zot_trap
 DEPTH:  Zot:*
 CHANCE: 20
@@ -19,26 +18,26 @@ MAP
 *
 ENDMAP
 
-NAME:  lemuel_zot_downstairs
-DEPTH: Zot:1-4
+NAME:   lemuel_zot_downstairs
+DEPTH:  Zot:1-4
 ORIENT: float
-TAGS:  allow_dup
-SUBST: . = .^
-KFEAT: ^ = Zot trap
-SUBST: > = }])
+TAGS:   allow_dup
+SUBST:  . = .^
+KFEAT:  ^ = Zot trap
+SUBST:  > = }])
 MAP
 xxxxxxx
 @....>x
 xxxxxxx
 ENDMAP
 
-NAME:  lemuel_zot_upstairs
-DEPTH: Zot:2-5
+NAME:   lemuel_zot_upstairs
+DEPTH:  Zot:2-5
 ORIENT: float
-TAGS:  allow_dup 
-SUBST: . = .^
-KFEAT: ^ = zot trap
-SUBST: < = ([{
+TAGS:   allow_dup 
+SUBST:  . = .^
+KFEAT:  ^ = zot trap
+SUBST:  < = ([{
 MAP
 xxxxxxx
 @....<x
@@ -56,9 +55,10 @@ TAGS:   no_rotate
 NSUBST: 1 = 6:2 / *=1
 SUBST:  1 = 1 .:5
 SUBST:  1 = 1 3
-MONS:   troll/deep troll/iron troll/ogre/two-headed ogre/w:2 iron devil
+MONS:   troll /deep troll / iron troll / ogre / two-headed ogre / w:2 iron devil
 MONS:   moth of wrath
-MONS:   hill giant/stone giant/fire giant/frost giant/ettin/w:5 efreet/w:3 titan
+MONS:   hill giant / stone giant / fire giant / frost giant / ettin /\
+        w:5 efreet / w:3 titan
 NSUBST: C = 2:= / *=c
 NSUBST: D = 2:= / *=c
 MAP
@@ -166,7 +166,7 @@ NAME:   lemuel_draconian_sentries
 DEPTH:  Zot:1-4
 ORIENT: float
 TAGS:   uniq_sentry no_rotate
-MONS:   red draconian scorcher/green draconian zealot/yellow draconian caller
+MONS:   red draconian scorcher / green draconian zealot / yellow draconian caller
 SUBST:  }=}}> , )=))> , ]=]]> , 1=123, w:w. , m:mn
 MAP
 ............................
@@ -190,8 +190,8 @@ NAME:   lemuel_draconian_sentries_small
 DEPTH:  Zot:1-4
 ORIENT: float
 TAGS:   uniq_sentry no_rotate
-MONS:   red draconian scorcher/green draconian zealot/yellow draconian caller
-SUBST: }=}}> , )=))> , ]=]]>, 1=123 , w:w. , m:mn
+MONS:   red draconian scorcher / green draconian zealot / yellow draconian caller
+SUBST:  }=}}> , )=))> , ]=]]>, 1=123 , w:w. , m:mn
 MAP
 ................
 ................
@@ -211,6 +211,7 @@ ENDMAP
 
 ###########################
 # Acid trip
+# chance for having all downstairs in the vault is 12.5%
 #
 NAME:   lemuel_acid_trip
 DEPTH:  Zot:1-4
@@ -220,7 +221,6 @@ MONS:   any nonbase yellow draconian
 SUBST:  1 = 1:2 .
 SUBST:  . = .:20 3:3 2:1
 SUBST:  }=}>, )=)>, ]=]>
-# chance for having all downstairs in the vault is 12.5%
 MAP
        xx++xx
      xxx....xxx
@@ -285,40 +285,40 @@ ENDMAP
 ##############################################################################
 # 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" \
-         }
+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 =
-KFEAT:   1 = any trap / w:20 floor
-KMONS:   1 = patrolling Orb Guardian
-KFEAT:   8 = any trap / w:20 floor
-SHUFFLE: ABab / ^^FF / ^^FF / ^^FF
-SHUFFLE: Aa / Bb 
-KFEAT:   A = any trap / w:30 floor
-KFEAT:   B = any trap / w:10 floor
-SUBST:   a=F, b=6 F
-SUBST:   ^ = ^ .:10
-SUBST:   ! = ^ .:40
-SUBST:   . = .:500 ^
+SUBST:    C = c:1000 =
+KFEAT:    1 = any trap / w:20 floor
+KMONS:    1 = patrolling Orb Guardian
+KFEAT:    8 = any trap / w:20 floor
+SHUFFLE:  ABab / ^^FF / ^^FF / ^^FF
+SHUFFLE:  Aa / Bb 
+KFEAT:    A = any trap / w:30 floor
+KFEAT:    B = any trap / w:10 floor
+SUBST:    a=F, b=6 F
+SUBST:    ^ = ^ .:10
+SUBST:    ! = ^ .:40
+SUBST:    . = .:500 ^
 
 #monsters
-MONS:    patrolling Orb Guardian, Killer Klown, electric golem, orb of fire
-MONS:    ancient lich, orange crystal statue / silver statue / ice statue
-SUBST:   8=8., 8=8., 5=5.
-SHUFFLE: 234
-SUBST:   ? = .:8 ?
-SUBST:   ? : KLM
-SUBST:   K = 4:30 5 8 9
-SUBST:   L = 4 5:30 8 9
-SUBST:   M = 4 5 8:30 9
+MONS:     patrolling Orb Guardian, Killer Klown, electric golem, orb of fire
+MONS:     ancient lich, orange crystal statue / silver statue / ice statue
+SUBST:    8=8., 8=8., 5=5.
+SHUFFLE:  234
+SUBST:    ? = .:8 ?
+SUBST:    ? : KLM
+SUBST:    K = 4:30 5 8 9
+SUBST:    L = 4 5:30 8 9
+SUBST:    M = 4 5 8:30 9
 
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
author	dploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573>	2008-10-20 14:10:36 +0000
committer	dploog <dploog@c06c8d41-db1a-0410-9941-cceddc491573>	2008-10-20 14:10:36 +0000
commit	a9f53dd003a8246adbcf8eddee5aa61d0d4c3b93 (patch)
tree	1868f22c67e917aa6afd82ab7ab21c4f8984cd50
parent	40d686b7f05b03bb1b63dbb062acea1c0415b1b2 (diff)
download	crawl-ref-a9f53dd003a8246adbcf8eddee5aa61d0d4c3b93.tar.gz crawl-ref-a9f53dd003a8246adbcf8eddee5aa61d0d4c3b93.zip