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

1 files changed, 676 insertions, 722 deletions

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