Another improvement to entry vault (Shiori).

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

1 files changed, 25 insertions, 28 deletions

diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index abdc55c4f1..d25574c913 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -31,6 +31,7 @@ ENDMAP
 # A horror show for the beginning adventurer (Shiori)
 NAME:    whats_in_store_for_you
 TAGS:    entry no_monster_gen no_pool_fixup no_item_gen
+CHANCE:  10000
 ORIENT:  west
 SHUFFLE: =@/AB ,  AB/CD
 SUBST:   A== , B=@ , C=x , D=x
@@ -39,36 +40,32 @@ KFEAT:   T = net trap
 # Seemingly pointless, since there are no active foes here... but
 # it had an unnerving effect on me the one time it happened by chance
 # ("Ack! Now I'm trapped too! Help!") so I coded it in. ^.^
+NSUBST:  M = 2=E / *=M E:2
+KFEAT:   E = shaft trap
+KFEAT:   M=shallow_water
+KFEAT:   N=shallow_water
+KFEAT:   O=shallow_water
+KFEAT:   Q=shallow_water
 SHUFFLE: M/N/O/P/Q
-SUBST:   P= MNO
-: if crawl.one_chance_in(2) then
-KFEAT: M=shallow_water
-KFEAT: N=shallow_water
-KFEAT: O=shallow_water
-KFEAT: Q=shallow_water
-: else
-KFEAT: M=floor
-KFEAT: N=floor
-KFEAT: O=floor
-KFEAT: Q=floor
-: end
-
-KMONS: M= human / elf / orc; nothing / naga; nothing / centaur; nothing / draconian; nothing / ogre; nothing / minotaur / troll / kobold / mummy / ghoul / w:30 nothing
-# no vampires or ogre-mages because they can get out of their cells or
-# create threats outside
-# no merfolk, alive or undead, because they insist on having deep water
-# in their cells, which annoys me
-# other player species don't exist as monsters
-KMONS: N= human zombie / elf zombie / orc zombie / naga zombie / centaur zombie / draconian zombie / ogre zombie / minotaur zombie / troll zombie / kobold zombie / mummy / w:50 nothing
-# ghouls drop out because they need sustenance and can't be reanimated
-# once starved
-KMONS: O= human skeleton / elf skeleton / orc skeleton / naga skeleton / centaur skeleton / draconian skeleton / ogre skeleton / minotaur skeleton / troll skeleton / kobold skeleton / mummy / w:80 nothing
-# and now for something completely different
-# if any of these turn out to be able to escape or project spells out of
-# their cells, they should be removed (I wanted to have killer klowns...)
+SUBST:   P = MNO
+#
+# Player monsters (no vampire or ogre-mages because they can get out of their 
+# cells or create threats outside; no merfolk, alive or undead, because they 
+# insist on having deep water in their cells, which annoys me; other player 
+# species don't exist as monsters):
+KMONS: M= human / elf / orc; nothing / naga; nothing / centaur; nothing / draconian; nothing / ogre; nothing / minotaur / troll / kobold / mummy / ghoul 
+#
+# Player monsters, zombie versions (ghouls drop out because they need sustenance
+# and can't be reanimated once starved):
+KMONS: N= human zombie / elf zombie / orc zombie / naga zombie / centaur zombie / draconian zombie / ogre zombie / minotaur zombie / troll zombie / kobold zombie / mummy
+# 
+# Player monsters, skeleton versions:
+KMONS: O= human skeleton / elf skeleton / orc skeleton / naga skeleton / centaur skeleton / draconian skeleton / ogre skeleton / minotaur skeleton / troll skeleton / kobold skeleton / mummy
+#
+# And now for something completely different (if any of these turn out to be 
+# able to escape or project spells out of their cells, they should be removed):
 KMONS: Q= orb of fire / ice dragon / shadow dragon / iron dragon / w:1 golden dragon / large abomination / tentacled monstrosity / w:1 black draconian; nothing / w:1 mottled draconian; nothing / w:1 yellow draconian; nothing / w:2 green draconian; nothing / w:1 purple draconian; nothing / w:2 red draconian; nothing / w:1 white draconian; nothing / w:1 pale draconian; nothing / nothing
-# And if anyone is careless with a wand of digging after coming through
-# all this to begin with, on their own head be it
+#
 MAP
 xxxxxxxxxxxxxx     xxxxxxxxx
 xxxxxxxxMxMxMxxxxxxxMxMxMxMx