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, 102 insertions, 75 deletions

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