Vault fixes + applied bobbens' levdes.vim water-colour patch.

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

5 files changed, 10 insertions, 39 deletions

diff --git a/crawl-ref/source/dat/crypt.des b/crawl-ref/source/dat/crypt.des
index 04336e7f93..e56cb741fb 100644
--- a/crawl-ref/source/dat/crypt.des
+++ b/crawl-ref/source/dat/crypt.des
@@ -333,7 +333,7 @@ vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
 vwwwwwwwwwwwwwwwwwwwwwwwwwww..wwwwwwwwwwwwwwwwwwwwwwwwwwwv
 vwwwwwwwwwwwwwwwwwwwwwwwAww....wwAwwwwwwwwwwwwwwwwwwwwwwwv
 vwwwwwwwwwwwwwwwwwwwwwwwwww....wwwwwwwwwwwwwwwwwwwwwwwwwwv
-vwwwwwwwwwwwwwwwwwwwwwwwww...(..wwwwwwwwwwwwwwwwwwwwwwwwwv
+vwwwwwwwwwwwwwwwwwwwwwwwww......wwwwwwwwwwwwwwwwwwwwwwwwwv
 vwwwwwwwwwwwwwwwwwwwwwAwww.[..{.wwwAwwwwwwwwwwwwwwwwwwwwwv
 vwwwwwwwwwwwwwwwwwwwwwwwwww....wwwwwwwwwwwwwwwwwwwwwwwwwwv
 vwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwv
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index df8093df41..8fc02bda98 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -144,38 +144,6 @@ xxxx111xxx
 xxxxxxxxxx
 ENDMAP
 
-####################################
-# shoot the duckies, win a prize!
-#(warning: some duckies may shoot back)
-#
-NAME: shooting_gallery_Lemuel
-ORIENT: float
-TAGS: no_pool_fixup no_monster_gen
-ITEM: potion of levitation q:2
-: if you.absdepth() <= 16 then
-MONS: orc wizard/centaur/jackal/killer bee larva/giant lizard/kobold/giant mite/grey rat/green rat/orange rat
-MONS: deep elf priest/orc high priest/cyclops/orc priest/jelly/ogre/troll/yak/orc warrior/sheep/hog
-: elseif you.absdepth() >= 17 then
-MONS: deep elf priest/orc high priest/cyclops/yaktaur/slime creature/yak/wyvern/big kobold/toenail golem
-MONS: yaktaur captain/manticore/deep elf high priest/orc sorcerer/ogre-mage/ugly thing/unseen horror
-: end
-KFEAT: $ = >
-KFEAT: * = <
-MAP
-ccccccccccccccccccccccccccccccccccccccccccccc
-ccxc$cxc*cxc$cxc*cxc$cxc*cxc$cxc*cxc$cxc*cxcc
-cxwwxwwwxwwwxwwwxwwwxwwwxwwwxwwwxwwwxwwwxwwxc
-ccwwww2www2www2www2www2www2www2www2www2wwwwcc
-cxwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwxc
-ccww1www1www1www1www1www1www1www1www1www1wwcc
-cxwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwxc
-cc.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.w.cc
-cx.........................................xc
-cc.........................................cc
-cx.........d..........d..........d.........xc
-cc.........................................cc
-ENDMAP
-
 ##############################################################################
 # Beware the mummy's curse (Lemuel)
 #
@@ -403,6 +371,7 @@ NAME: onia_ninara_012_swampy_vault
 TAGS: no_pool_fixup no_monster_gen uniq_swamp_vault
 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 / ~
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 6500618317..350cf59a50 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -190,12 +190,12 @@ KFEAT: N = teleport trap
 SUBST: g=., h=., i=., j=., k=., l=., n=.
 SUBST: G=., H=., I=., J=., K=., L=., N=.
 SUBST: Y=*, Z=*
-KFEAT: X = exit_portal_vault
+KFEAT: X = <
 KMONS: X = minotaur
 KFEAT: S = granite_statue
 CHANCE: 2
 MAP
-............
+.............
 .vvvvvvvvvvv.
 .vvXvvYvvZvv.
 .vv+vv+vv+vv.
diff --git a/crawl-ref/source/dat/levdes.vim b/crawl-ref/source/dat/levdes.vim
index 413a49f027..980cf277f2 100644
--- a/crawl-ref/source/dat/levdes.vim
+++ b/crawl-ref/source/dat/levdes.vim
@@ -80,7 +80,8 @@ syn match desMapWaxWall /a/ contained
 syn match desMapMonst /[0-9]/ contained
 syn match desMapGold /\$/ contained
 syn match desMapLava /l/ contained
-syn match desMapWater /[wW]/ contained
+syn match desMapWater /w/ contained
+syn match desMapShallow /W/ contained
 syn match desMapEntry /@/ contained
 syn match desMapTrap  /\^/ contained
 
@@ -91,8 +92,8 @@ syn match desMapOrb /Z/ contained
 syn cluster desMapElements contains=desMapBookend,desMapWall,desMapFloor
 syn cluster desMapElements add=desMapMonst,desMapCrystalWall,desMapGold
 syn cluster desMapElements add=desMapLava,desMapMetalWall,desMapDoor
-syn cluster desMapElements add=desMapStoneWall,desMapWater,desMapTrap
-syn cluster desMapElements add=desMapEntry,desMapWaxWall
+syn cluster desMapElements add=desMapStoneWall,desMapWater,desMapShallow
+syn cluster desMapElements add=desMapTrap,desMapEntry,desMapWaxWall
 
 syn cluster desMapElements add=desMapRune,desMapOrb,desMapValuable
 
@@ -134,6 +135,7 @@ hi desMapMonst guifg=red ctermfg=darkred
 hi desMapLava guifg=red gui=bold ctermfg=red
 hi desMapTrap guifg=red gui=bold ctermfg=red
 hi desMapWater guifg=lightblue ctermfg=darkblue
+hi desMapShallow guifg=lightcyan ctermfg=darkcyan
 hi desMapGold guifg=#c09000 ctermfg=yellow
 hi desMapDoor guifg=brown gui=bold ctermfg=black ctermbg=brown
 hi desMapEntry guifg=black guibg=white gui=bold ctermfg=white ctermbg=black
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 059c374d00..de55dba25c 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -74,7 +74,7 @@ ENDMAP
 # No loot but the elves' gear, but at the depth this appears that may be good
 #
 NAME:    elves_outpost_lemuel
-DEPTH:   D:8-20, Orc:*
+DEPTH:   D:14-20, Orc:2-
 MONS:    deep elf soldier/w:4 deep elf fighter
 MONS:    w:20 deep elf mage/deep elf conjurer/deep elf summoner
 SHUFFLE: ?:/bb, :;/ww