Added Rubinstein and Lemuel to CREDITS.

Added tty colours to levdes syntax highlight script.
Set shallowest depth for farm_and_country to 16.
distclean now depends on clean for Windows makefile.mgw.

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

4 files changed, 54 insertions, 35 deletions

diff --git a/crawl-ref/CREDITS b/crawl-ref/CREDITS
index f538d8d79a..85ee808cf5 100644
--- a/crawl-ref/CREDITS
+++ b/crawl-ref/CREDITS
@@ -1,5 +1,5 @@
-The Dungeon Crawl Stone Soup team (Peter Berger, Nat Lanza, Haran Pilpel, Erik

-Piper, David Ploog, Darshan Shaligram) would like to thank:

+The Dungeon Crawl Stone Soup team (Peter Berger, Nat Lanza, Haran Pilpel, 

+Erik Piper, David Ploog, Darshan Shaligram) would like to thank:

 

 * Linley Henzell, the author of Dungeon Crawl, for writing this great game.

 

@@ -15,6 +15,7 @@ Piper, David Ploog, Darshan Shaligram) would like to thank:
 We'd also like to thank members of the Dungeon Crawl community who have

 contributed to Dungeon Crawl Stone Soup:

 

+Peter Borgmann

 Matthew Cline

 Elethiomel

 Ben Goetter

@@ -24,6 +25,7 @@ Ryan Kusnery
 Erkki Nurmi

 Yuuma Oohara

 Pedro

+Lemuel Pitkin

 Johanna Ploog

 David Rose

 Johan Strandell

diff --git a/crawl-ref/source/dat/levdes.vim b/crawl-ref/source/dat/levdes.vim
index c489be52a7..116fd4c3a4 100644
--- a/crawl-ref/source/dat/levdes.vim
+++ b/crawl-ref/source/dat/levdes.vim
@@ -2,6 +2,7 @@
 "
 " Basic Vim syntax highlighting for Dungeon Crawl Stone Soup level design
 " (.des) files.
+"
 
 if version < 600
   syntax clear
@@ -54,22 +55,24 @@ hi link desComment    Comment
 hi link desMap        String
 hi link desOrientation Type
 
-hi desMapWall guifg=darkgrey term=bold gui=bold
-hi desMapCrystalWall guifg=#009040 term=bold gui=bold
-hi desMapStoneWall guifg=black gui=bold
-hi desMapMetalWall guifg=#004090 term=bold gui=bold
-hi desMapWaxWall guifg=#a0a000 gui=bold
-hi desMapFloor guifg=#008000
-hi desMapMonst guifg=red
-hi desMapLava guifg=red gui=bold
-hi desMapTrap guifg=red gui=bold
-hi desMapWater guifg=lightblue
-hi desMapGold guifg=#c09000
-hi desMapDoor guifg=brown gui=bold
-hi desMapEntry guifg=black guibg=white gui=bold
+hi desMapWall guifg=darkgray term=bold gui=bold ctermfg=brown
+hi desMapCrystalWall guifg=#009040 term=bold gui=bold ctermfg=green
+hi desMapStoneWall guifg=black gui=bold ctermfg=darkgray
+hi desMapMetalWall guifg=#004090 term=bold gui=bold ctermfg=blue
+hi desMapWaxWall guifg=#a0a000 gui=bold ctermfg=yellow
+hi desMapFloor guifg=#008000 ctermfg=lightgray
+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 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
 
-hi desMapValuable guifg=darkgreen gui=bold
-hi desMapRune     guifg=orange gui=bold
-hi desMapOrb      guibg=gold guifg=black
+hi desMapValuable guifg=darkgreen gui=bold ctermfg=lightgreen
+hi desMapRune     guifg=orange gui=bold ctermfg=white
+hi desMapOrb      guibg=gold guifg=black ctermfg=white
 
 syn sync minlines=45
+
+let b:current_syntax="levdes"
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 0cc79560ab..d9a48481ac 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -639,6 +639,7 @@ MONS: hell knight, great orb of eyes
 
 NAME: farm_and_country
 ORIENT: encompass
+DEPTH: 16-27
 
 MAP
 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -1411,6 +1412,7 @@ ENDMAP
 # Anthill
 
 NAME: minivault_29
+MONS: queen ant, soldier ant, giant ant, ant larva
 
 MAP
 .3......3...
@@ -1427,30 +1429,42 @@ MAP
 .3.......33.
 ENDMAP
 
-MONS: queen ant, soldier ant, giant ant, ant larva
-
 ###################################
 # Solitary fountain
-
-NAME: minivault_30
+NAME: solitary_fountain
+SYMBOL: TUV
 
 MAP
-............
-............
-............
-............
-............
-.....?......
-............
-............
-............
-............
-............
-............
+.....
+.....
+..?..
+.....
+.....
 ENDMAP
 
+###################################
+# Fountainhead
+
+NAME: fountainhead
 SYMBOL: TUV
 
+MAP
+..............
+..xxxw..wxxx..
+.x...xwwx...x.
+.x.?.xwwx.?.x.
+.x...xwwx...x.
+..xxxwwwwxxx..
+....wwwwww....
+....wwwwww....
+..xxxwwwwxxx..
+.x...xwwx...x.
+.x.?.xwwx.?.x.
+.x...xwwx...x.
+..xxxw..wxxx..
+..............
+ENDMAP
+
 ###################################
 # jmf: Multi-god temple thing
 
diff --git a/crawl-ref/source/makefile.mgw b/crawl-ref/source/makefile.mgw
index 17a47f132c..e098964b41 100644
--- a/crawl-ref/source/makefile.mgw
+++ b/crawl-ref/source/makefile.mgw
@@ -123,7 +123,7 @@ clean:
 		$(subst /,\,$(DELETE) $(UTIL)*.tab.c)
 		$(subst /,\,$(DELETE) *.ixx)
 
-distclean:
+distclean: clean
 		$(DELETE) $(OPATH)\*.o 
 		$(DELETE) *.o
 		$(DELETE) bones.*