Vault updates (David).

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

5 files changed, 173 insertions, 157 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 2ef3df07c9..e0794bf81c 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -3,6 +3,67 @@
 ###############################################################################
 
 ##############################################################################
+# Matthew's entry vaults
+##############################################################################
+
+############################################################################ 
+# A spiral made entirely of glass
+NAME:    zelgadis_glass_entry_001
+TAGS:    entry
+ORIENT:  float
+SHUFFLE: {[(<
+SUBST:   < = .
+MAP
+mmmmmmmmmmmmmmmmmm
+m................m
+m.mmmmmmmmmmmmmm.m
+m.m............m.m
+m.m.mmmmmmmmmm.m.m
+m.m.m........m.m.m
+m.m.m.mmmmmm.m.m.m
+m.m.m.m....m.m.m.m
+m.m.m.m.mm.m.m.m.m
+m.m.m.m{[m.m.m.m.m
+m.m.m.m(<m.m.m.m.m
+m.m.m.mmmm.m.m.m.m
+m.m.m......m.m.m.m
+m.m.mmmmmmmm.m.m.m
+m.m..........m.m.m
+m.mmmmmmmmmmmm.m.m
+m..............m.m
+mmmmmmmmmmmmmmmm@m
+ENDMAP
+
+############################################################################ 
+# A spiral made of rock, with lots of "windows".
+NAME: zelgadis_glass_entry_002
+TAGS: entry
+ORIENT: float
+SHUFFLE: {[(<
+SUBST: < = .
+MAP
+mxmxmxmxmxmxxmxxmx
+x................m
+m.xmxmxmxmxmxmxm.x
+x.m............x.m
+m.x.mxmxmxmxmx.m.x
+x.m.x........m.x.m
+m.x.m.xmxmxx.x.m.x
+x.m.x.m....x.m.x.m
+m.x.m.x.mx.m.x.m.x
+x.m.x.m{[m.x.m.x.m
+m.x.m.x(<x.m.x.m.x
+x.m.x.xmxx.x.m.x.m
+m.x.m......m.x.m.x
+x.m.xxmxmxmx.m.x.m
+m.x..........x.m.x
+x.xmxmxmxmxmxm.x.m
+m..............m.x
+xxmxmxmxmxmxmxmx@m
+ENDMAP
+
+
+##############################################################################
 # Zaba's entry vaults
 ##############################################################################
 
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 4443bb689f..eea8f2b0ea 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -340,14 +340,15 @@ ENDMAP
 
 #############################################################################
 # Oklob gauntlet
-#
+# average of 2.5 oklobs, and at most 5 of them
 NAME:    oklob_2
 DEPTH:   D:18-27, Lair, Elf
 MONS:    plant, oklob plant
 ORIENT:  float
 SHUFFLE: ]})yY / defzZ
-SUBST:   '=12w, "=ww.
-SUBST:   d=|*, e=|*, f=|*, y=., Y=@, z=x, Z=x
+NSUBST:  ' = 5:2 *:1 
+SUBST:   1=1w, 2=2w, "=ww.
+SUBST:   d=|*, e=|*, f=|*, y=+, Y=@, z=x, Z=x
 SHUFFLE: xxxc
 MAP
 yyyyyyYyyyyyy
diff --git a/crawl-ref/source/dat/glass.des b/crawl-ref/source/dat/glass.des
deleted file mode 100644
index 40f88ac3e5..0000000000
--- a/crawl-ref/source/dat/glass.des
+++ /dev/null
@@ -1,152 +0,0 @@
-###########################################################################
-# Small areas with translucent rock (glass) columns which you can duck
-# behind, but still see the monster you're ducking from (and they can
-# still see you
-NAME:  glass_columns_a
-DEPTH:
-MAP
-.....
-.m.m.
-.....
-.m.m.
-.....
-ENDMAP
-
-NAME:  glass_columns_b
-DEPTH:
-MAP
-.......
-.m.m.m.
-.......
-.m.m.m.
-.......
-.m.m.m.
-.......
-ENDMAP
-
-NAME:  glass_columns_c
-DEPTH:
-MAP
-.........
-.m.m.m.m.
-.........
-.m.m.m.m.
-.........
-.m.m.m.m.
-.........
-.m.m.m.m.
-.........
-ENDMAP
-
-##########################################################
-# A feature encased in glass, for flavour.
-NAME:  feat_on_display
-DEPTH:
-SUBST: ? = TUl
-TAGS:  no_monster_gen no_item_gen
-MAP
-.....
-.mmm.
-.m?m.
-.mmm.
-.....
-ENDMAP
-
-#######################################################################
-# An item encased in glass.  If the player wants it, it can be dug out.
-NAME:  item_on_display_a
-CHANCE: 9
-TAGS:  no_monster_gen no_item_gen
-MAP
-.....
-.mmm.
-.m%m.
-.mmm.
-.....
-ENDMAP
-
-#####################################################################
-# A good item encased in transparent stone.
-NAME:  item_on_display_b
-CHANCE: 1
-TAGS:  no_monster_gen no_item_gen
-MAP
-.....
-.nnn.
-.n*n.
-.nnn.
-.....
-ENDMAP
-
-#####################################################################
-# An average monster in a cage of glass; can get out if it has the
-# ability to dig or blink like a blink-frog.  Also, the player can
-# dig it out.
-NAME:  caged_monster_a
-DEPTH: D, Elf, Snake, Vault
-MAP
-.....
-.mmm.
-.m0m.
-.mmm.
-.....
-ENDMAP
-
-############################################################################ 
-# Entry vaults using translucent (glass) walls
-
-# A spiral made entirely of glass
-
-NAME:    glass_entry_001
-TAGS:    entry
-ORIENT:  float
-SHUFFLE: {[(<
-SUBST:   < = .
-MAP
-mmmmmmmmmmmmmmmmmm
-m................m
-m.mmmmmmmmmmmmmm.m
-m.m............m.m
-m.m.mmmmmmmmmm.m.m
-m.m.m........m.m.m
-m.m.m.mmmmmm.m.m.m
-m.m.m.m....m.m.m.m
-m.m.m.m.mm.m.m.m.m
-m.m.m.m{[m.m.m.m.m
-m.m.m.m(<m.m.m.m.m
-m.m.m.mmmm.m.m.m.m
-m.m.m......m.m.m.m
-m.m.mmmmmmmm.m.m.m
-m.m..........m.m.m
-m.mmmmmmmmmmmm.m.m
-m..............m.m
-mmmmmmmmmmmmmmmm@m
-ENDMAP
-
-# A spiral made of rock, with lots of "windows".
-
-NAME: glass_entry_002
-TAGS: entry
-ORIENT: float
-SHUFFLE: {[(<
-SUBST: < = .
-MAP
-mxmxmxmxmxmxxmxxmx
-x................m
-m.xmxmxmxmxmxmxm.x
-x.m............x.m
-m.x.mxmxmxmxmx.m.x
-x.m.x........m.x.m
-m.x.m.xmxmxx.x.m.x
-x.m.x.m....x.m.x.m
-m.x.m.x.mx.m.x.m.x
-x.m.x.m{[m.x.m.x.m
-m.x.m.x(<x.m.x.m.x
-x.m.x.xmxx.x.m.x.m
-m.x.m......m.x.m.x
-x.m.xxmxmxmx.m.x.m
-m.x..........x.m.x
-x.xmxmxmxmxmxm.x.m
-m..............m.x
-xxmxmxmxmxmxmxmx@m
-ENDMAP
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 3f2d9c3e49..21aa8fc919 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -42,6 +42,100 @@ MAP
 .
 ENDMAP
 
+###########################################################################
+# Small areas with translucent rock (glass) columns which you can duck
+# behind, but still see the monster you're ducking from (and they can
+# still see you
+NAME:  glass_columns_a
+DEPTH:
+MAP
+.....
+.m.m.
+.....
+.m.m.
+.....
+ENDMAP
+
+NAME:  glass_columns_b
+DEPTH:
+MAP
+.......
+.m.m.m.
+.......
+.m.m.m.
+.......
+.m.m.m.
+.......
+ENDMAP
+
+NAME:  glass_columns_c
+DEPTH:
+MAP
+.........
+.m.m.m.m.
+.........
+.m.m.m.m.
+.........
+.m.m.m.m.
+.........
+.m.m.m.m.
+.........
+ENDMAP
+
+##########################################################
+# A feature encased in glass, for flavour.
+NAME:  feat_on_display
+DEPTH:
+SUBST: ? = TUl
+TAGS:  no_monster_gen no_item_gen
+MAP
+.....
+.mmm.
+.m?m.
+.mmm.
+.....
+ENDMAP
+
+#######################################################################
+# An item encased in glass.  If the player wants it, it can be dug out.
+NAME:  item_on_display_a
+CHANCE: 9
+TAGS:  no_monster_gen no_item_gen
+MAP
+.....
+.mmm.
+.m%m.
+.mmm.
+.....
+ENDMAP
+
+#####################################################################
+# A good item encased in transparent stone.
+NAME:  item_on_display_b
+CHANCE: 1
+TAGS:  no_monster_gen no_item_gen
+MAP
+.....
+.nnn.
+.n*n.
+.nnn.
+.....
+ENDMAP
+
+#####################################################################
+# An average monster in a cage of glass; can get out if it has the
+# ability to dig or blink like a blink-frog.  Also, the player can
+# dig it out.
+NAME:  caged_monster_a
+DEPTH: D, Elf, Snake, Vault
+MAP
+.....
+.mmm.
+.m0m.
+.mmm.
+.....
+ENDMAP
+
 ###################################
 # pond with fungi
 #
@@ -998,10 +1092,19 @@ ENDMAP
 #
 # Intentionally moved this deeper because explore will gladly run into the
 # room, and being hit by multiple mimics is un-fun.
+# Slight tweak by having a fraction (unknown to the player) of items be 
+# real. (dp)
 #
 NAME: fake_naga_vault
 DEPTH: 15-26, !Orc, !Lair, !Swamp, !Shoal
 MONS: mimic, guardian naga
+ITEM: any good_item
+: local b = crawl.random2(10)
+: if b > 7 then
+SUBST: 1 = 1d
+: elseif b > 1 then
+SUBST: 1 = 111d
+: end
 MAP
 ...........
 .xxxxxxxxx.
@@ -1463,4 +1566,4 @@ x...x
 x.*.=
 x...x
 xxxxx
-ENDMAP
+ENDMAP
\ No newline at end of file
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index cc561768d2..eef3ecc26e 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -689,8 +689,11 @@ void up_stairs(dungeon_feature_type force_stair,
         mprf("Welcome back to %s!",
              branches[you.where_are_you].longname);
 
+#ifdef USE_TILE
     const bool newlevel =
-        load(stair_taken, LOAD_ENTER_LEVEL, old_level_type, old_level, old_where);
+#endif
+        load(stair_taken, LOAD_ENTER_LEVEL, old_level_type,
+             old_level, old_where);
 
     set_entry_cause(entry_cause, old_level_type);
     entry_cause = you.entry_cause;