Added new vaults (incl. Crypt, altars, entries). Contributed by Lemuel, bobbens, zaba.

Fixed level lexer to handle DOS-style line endings in .des files on Unix.


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

1 files changed, 214 insertions, 6 deletions

diff --git a/crawl-ref/source/dat/hive.des b/crawl-ref/source/dat/hive.des
index dbfc2cf3fb..1d28c0aae5 100644
--- a/crawl-ref/source/dat/hive.des
+++ b/crawl-ref/source/dat/hive.des
@@ -154,9 +154,9 @@ KMONS:   l = firedrake / w:200 nothing
 KFEAT:   l = l
 ORIENT:  float
 MAP
-..................
-.'.aa'aa.'.'......
-..aaRa'...a'.'a...
+ .............    
+.'.aa'aa.'.'....  
+..aaRa'...a'.'a.. 
 .'a2'Y.aaaX.aa.'..
 .aV.1aaa'1aaa.'.a.
 ..aa21'2O2aaa4.aa.
@@ -166,9 +166,9 @@ MAP
 .aa...aaa.aa......
 .a..aaaa.'........
 ..''..a..a.llllll.
-....'..aaa.lLLLLl.
-.......''..llllll.
-..................
+ ...'..aaa.lLLLLl.
+    ...''..llllll.
+       .......... 
 ENDMAP
 
 #############################################################################
@@ -252,6 +252,214 @@ MAP
      ....
 ENDMAP
 
+##############################################################################
+# Hive vaults
+##############################################################################
+
+NAME: Hive_Balancer
+DEPTH: Hive:*
+TAGS: dummy
+CHANCE: 200
+MAP
+x
+ENDMAP
+# Note the higher weight to the empty vault:
+# this is because vaults in the Hive should be rare
+
+NAME: lemuel_Hive_Pool
+DEPTH: Hive:*
+SUBST: W=W. ,  ?:W. , !:W.
+MAP
+        WwwwW
+      ??wwwwwwW
+   ????wwwwwwwwW
+ ????wwwwwwwwwW
+????wwwwwwwwWW
+??..WwwwwwwW
+ ?!.WwwwwwW
+ !...Wwwwww
+ !!!..WwwwW
+  !!!..Wwwww
+    !!!WwwW
+     !!!wwW
+      !!!w
+        WW
+ENDMAP
+
+NAME: lemuel_Hive_Moat
+DEPTH: Hive:*
+ORIENT: float
+MAP
+      www
+    wwwwwww
+   wwww.wwww
+  wwww. .wwww
+  wwww. .wwww
+ wwww.).].wwww
+ wwww..}..wwww
+  wwww. .wwww
+  wwww. .wwww
+   wwww.wwww
+    wwwwwww
+      www
+ENDMAP
+
+NAME: lemuel_Hive_Zombies
+DEPTH: Hive:1-3
+ORIENT: float
+TAGS: no_monster_gen
+MONS: killer bee zombie/weight:2 killer bee larva zombie, necromancer, plant
+SHUFFLE: {}
+SUBST: . = .:50 1:4 3:1
+SUBST: > = <>
+SUBST: }=} .:3
+SUBST: {={ .:3
+SUBST: == +:5 = .:3
+SUBST: ? = a.
+MAP
+       aaaaaa
+      aa?..?aa
+aaaaaaa?....?aa
+a{...........?aaa
+aaaaaa?........?aaaa
+     aa...........?aaaa
+      a?..111........?aa
+      a?.11111........?a
+      aa.11111........?aa
+       a?.111..........?aaaaaaaa
+       a?.....................}a
+ccccccca...............?aaaaaaaa
+c|..=2.+...........??aaaa
+cccccccaa?.......?aaaa
+        aa?....?aaa
+         aaa...aa
+           a?.?a
+         aaa??aa
+       aaa????a
+     aaa....?aa
+    aa?.>..aaa
+    a?....aa
+    aa..?aa
+     a?aaa
+     aaa
+ENDMAP
+
+NAME: lemuel_Hive_Oklob
+DEPTH: Hive:*
+MONS: oklob plant
+MAP
+1
+ENDMAP
+
+NAME: lemuel_Big_Bunch_of_Bees
+MONS: killer bee/weight:1 killer bee larva
+MAP
+      11111
+    111111111
+   11111111111
+   11111111111
+  1111111111111
+  1111111111111
+  1111111111111
+   11111111111
+   11111111111
+    111111111
+      11111
+ENDMAP
+
+NAME: lemuel_troublesome_eels
+DEPTH: Hive:*
+KFEAT: X = deep_water
+KMONS: X = electrical eel
+SUBST: W=w1.
+SUBST: . = 1:1 .
+SUBST: 1 = 1 .:5
+MONS: plant
+MAP
+  ....111....  
+ ...1111111... 
+...11WwwwW11...
+..11WwwXwwW11..
+.11WwwXwXwwW11.
+11WwwXwXwXwwW11
+11WwXwXwXwXwW11
+11WwwXwXwXwwW11
+.11WwwXwXwwW11.
+..11WwwXwwW11..
+...11WwwwW11...
+ ...1111111... 
+  ....111....  
+ENDMAP
+
+NAME: lemuel_wasp_nest
+DEPTH: Hive:2-3
+MONS: yellow wasp/weight:2 red wasp
+CHANCE: 1
+SUBST: 1=1 .:15
+SUBST: ?=a.
+MAP
+     a?@?a
+     a?.?a
+  aaaaa.aaaaa
+ aa111a.a111aa
+aa111aa.aa111aa
+a111aaa.aaa111a
+a?1.??a.a??.1?a
+aa?...a.a...?aa
+ aaa?.....?aaa
+   aaa?.?aaa
+     aa.aa
+      a.a
+      a.a
+      a*a
+      aaa
+ENDMAP
+
+NAME: lemuel_hive_grid_a
+DEPTH: Hive:*
+CHANCE: 4
+MAP
+a.a.a.a.a.a.a.a.a
+aa.a.a.a.a.a.a.aa
+a.a.a.a.a.a.a.a.a
+aa.a.a.a.a.a.a.aa
+a.a.a.a.a.a.a.a.a
+aa.a.a.a.a.a.a.aa
+a.a.a.a.a.a.a.a.a
+aa.a.a.a.a.a.a.aa
+a.a.a.a.a.a.a.a.a
+aa.a.a.a.a.a.a.aa
+a.a.a.a.a.a.a.a.a
+ENDMAP
+
+NAME: lemuel_hive_grid_b
+DEPTH: Hive:*
+CHANCE: 6
+MAP
+a.a.a.a.aa
+aa.a.a.a.a
+a.a.a.a.aa
+aa.a.a.a.a
+a.a.a.a.aa
+aa.a.a.a.a
+a.a.a.a.aa
+ENDMAP
+
+NAME: lemuel_hive_grid_c
+DEPTH: Hive:*
+CHANCE: 10
+MAP
+     aa.aa
+    aa.a.aa
+   aa.a.a.aa
+  aa.a.a.a.aa
+ aa.a.a.a.a.aa
+  aa.a.a.a.aa
+   aa.a.a.aa
+    aa.a.aa
+     aa.aa
+ENDMAP
+
 
 ##############################################################################
 # Hive branch end maps