Map and help cleanup (dpeg).

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

1 files changed, 20 insertions, 17 deletions

diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index eea8f2b0ea..787851fd07 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -49,10 +49,11 @@ ENDMAP
 ##############################################################################
 # Cavepeople
 #
-NAME: erik_1
+NAME:   erik_1
 ORIENT: float
-TAGS: no_monster_gen
-DEPTH: D:7-11, Lair
+CHANCE: 5
+TAGS:   no_monster_gen
+DEPTH:  D:7-11, Lair
 #
 SHUFFLE: rR/sS/uU/vV/wW/yY/zZ, uU/nN
 SUBST: r=n, R=N, s=n, S=N
@@ -61,8 +62,8 @@ SUBST: u=x, v=x, w=x, y=x, z=x
 SUBST: U=x, V=x, W=x, Y=x, Z=x
 #
 SUBST: 1 = 1:20 ., 2=2., 3=23, 4=24
-MONS: jackal/hound, human, Edmund/Jessica/Sigmund, Michael/Ijyb/Psyche
-MONS: sheep/nothing
+MONS:  jackal/hound, human, Edmund/Jessica/Sigmund, Michael/Ijyb/Psyche
+MONS:  sheep/nothing
 MAP
          xSxxxxx    xxxxxxxxxxUx
          xxssxxx    xx1xxxxxxuxx
@@ -149,7 +150,7 @@ ENDMAP
 #
 NAME:    MiniTomb
 ORIENT:  float
-DEPTH:   D:15-26
+DEPTH:   D:15-26, Crypt
 MONS:    large zombie/nothing, mummy, guardian mummy, greater mummy, large zombie
 MONS:    mummy / nothing
 SHUFFLE: 2F, cbv
@@ -213,7 +214,7 @@ ENDMAP
 # Insect pit (Lemuel)
 #
 NAME:   insect_pit
-FLAGS:  no_rotate
+TAGS:   no_rotate
 ORIENT: float
 DEPTH:  D:5-12, Elf, Vault
 SUBST:  1 = 1:70 2:60 3:25
@@ -269,6 +270,7 @@ NAME:    ice1_lemuel
 MONS:    ice statue
 TAGS:    no_pool_fixup
 ORIENT:  float
+DEPTH:   D:5-20, Elf
 SUBST:   * : *$
 SUBST:   * = |:5 * .
 SUBST:   T = TU
@@ -276,6 +278,7 @@ SHUFFLE: xb/cc, ABC
 : if crawl.coinflip() then
 KFEAT:   X = < / >
 KITEM:   X = any good_item
+SUBST:   A=., B=., C=.
 : else
 SUBST:   X=*, B=., C=.
 KFEAT:   A = teleport trap
@@ -342,7 +345,7 @@ ENDMAP
 # Oklob gauntlet
 # average of 2.5 oklobs, and at most 5 of them
 NAME:    oklob_2
-DEPTH:   D:18-27, Lair, Elf
+DEPTH:   D:18-27, Lair, Snake, Elf
 MONS:    plant, oklob plant
 ORIENT:  float
 SHUFFLE: ]})yY / defzZ
@@ -368,7 +371,7 @@ ENDMAP
 #
 # Disallowing this vault on branch starts, as brown stairs can't help there.
 # Chance for a plant to turn oklob based on dungeon level. Elf:7 is hard, but
-# considered okay (seeing as how long it is delayed in most cases anyway).
+# considered okay.
 #
 NAME:    oklob_3
 DEPTH:   D:21-27, Lair:2-10, Elf:2-7
@@ -409,9 +412,10 @@ ENDMAP
 #
 # island version for shoal in lair.des -evk
 #
-NAME: onia_ninara_012_swampy_vault
-TAGS: no_pool_fixup no_monster_gen uniq_swamp_vault
-ORIENT: float
+NAME:    onia_ninara_012_swampy_vault
+TAGS:    no_pool_fixup no_monster_gen uniq_swamp_vault
+DEPTH:   D:16-20, Lair:3-10, Swamp, Snake, Slime
+ORIENT:  float
 SHUFFLE: AB@
 SUBST: x = .:30 W x:4 
 SUBST: A : x, B : x
@@ -425,7 +429,6 @@ KMONS: E = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito
 KMONS: F = w:2 slime creature / swamp worm / giant blowfly / w:2 giant mosquito / w:2 electrical eel / w:1000 nothing
 KMONS: H = swamp drake / swamp dragon / hydra / w:20 nothing
 KITEM: H = any good_item / any potion / w:20 nothing / gold
-DEPTH: D:16-20, Lair:3-10, Swamp, Snake, Slime
 MAP
 xxxxxxxxxxxxxxxxx@xxxxxxxxxxxxxxx
 xxxxxxGGGxxxxxxGEDEExxxxGGxxxxxxx
@@ -450,10 +453,10 @@ ENDMAP
 ###########################
 # Another low-level vault - LP
 
-NAME: reptile_caves
-DEPTH: D:8-12, Lair:*
-MONS: giant gecko/giant newt, giant lizard, giant iguana, firedrake/swamp drake
-MONS: snake, brown snake, yellow snake
+NAME:  reptile_caves
+DEPTH: D:10-13, Lair, Snake
+MONS:  giant gecko/giant newt, giant lizard, giant iguana, firedrake/swamp drake
+MONS:  snake, brown snake, yellow snake
 SUBST: 4 = 34
 SUBST: 3 = 3:20 2
 SUBST: 2 = 2:20 1