Fixed buggy maps.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2731 c06c8d41-db1a-0410-9941-cceddc491573

6 files changed, 12 insertions, 5 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index d14768abc0..494ebcda0c 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -2094,6 +2094,7 @@ SHUFFLE: {[(
 MONS: plant
 SUBST: . = .:140 d
 KITEM: d : apple/apricot/pear/apricot/orange/banana/strawberry/lemon
+KFEAT: d = .
 MAP
   .....
  .......
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 8fc02bda98..8a25b759cd 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -373,12 +373,12 @@ ORIENT: float
 SHUFFLE: AB@
 SUBST: x = .:30 W x:4 
 SUBST: A : x, B : x
-SUBST: D = .:30 W
 KFEAT: E = w:20 . / x / w:50 W / w:30 w / ~
 KFEAT: F = w:150 w / w:70 W / ~ / . / x
 KFEAT: G = x / . / w / W
 KFEAT: H = . / W
-KMONS: D = Plant / w:200 nothing
+KMONS: D = plant / w:200 nothing
+KFEAT: D = w:30 . / W
 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
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index 8f09b7547b..796334b900 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -343,7 +343,6 @@ MONS:    Antaeus, Ice Fiend, ice dragon / nothing
 ITEM:    any, any misc, any misc, any misc
 SHUFFLE: O1d / e0% / f9* / g8|
 KMONS:   d = ice devil w:5 / Ice Fiend / nothing w:5
-KITEM:   d = any
 SUBST:   ' = w .
 
 MAP
diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index 8418595331..698377f080 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -413,12 +413,12 @@ DEPTH:   Shoal
 ORIENT:  float
 SHUFFLE: AB@
 SUBST:   A : x, B : x
-SUBST:   D = .:30 W
 KFEAT:   E = w:20 . / x / w:50 W / w:30 w / ~
 KFEAT:   F = w:150 w / w:70 W / ~ / . / x
 KFEAT:   G = x / . / w / W
 KFEAT:   H = . / W
-KMONS:   D = Plant / w:200 nothing
+KMONS:   D = plant / w:200 nothing
+KFEAT:   D = w:30 . / W
 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
diff --git a/crawl-ref/source/dat/large.des b/crawl-ref/source/dat/large.des
index ca3d208822..7618f9c8ee 100644
--- a/crawl-ref/source/dat/large.des
+++ b/crawl-ref/source/dat/large.des
@@ -229,6 +229,7 @@ KMONS:   P = orange crystal statue
 KFEAT:   P = floor
 KMONS:   k = giant eyeball
 KITEM:   k = potion of experience / any good_item
+KFEAT:   k = .
 SHUFFLE: rstu, RST
 SUBST:   r==, s=x, t=x, u=x, R==, S=x, T=x
 MAP
@@ -922,6 +923,8 @@ KMONS:   z = killer bee
 KMONS:   Z = bumblebee
 KITEM:   z = royal jelly / honeycomb w:20 / nothing w:120
 KITEM:   Z = royal jelly / honeycomb w:20 / nothing w:120
+KFEAT:   Z = .
+KFEAT:   z = .
 : if crawl.random2(3) == 0 then
 KMONS:   ! = orc / orc warrior / orc knight / nothing w:30
 KMONS:   & = orc warlord / orc knight / nothing w:20
@@ -932,6 +935,8 @@ KMONS:   & = yaktaur captain / nothing
 KMONS:   ! = naga / nothing
 KMONS:   & = naga warrior / greater naga
 : end
+KFEAT:   & = .
+KFEAT:   ! = .
 SUBST:   * = * % % $ $ f
 SUBST:   ; = 9 0
 SUBST:   !=%$, &=*%
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index de55dba25c..6fb45e50fb 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -652,6 +652,8 @@ KITEM: A = gold / nothing
 KITEM: B = gold / nothing
 KITEM: C = gold / nothing
 KITEM: D = gold / nothing
+KFEAT: B = .
+KFEAT: D = .
 MAP
 ............
 .xxxxxxxxxx.