Added Shiori's Elf and Orc vaults.

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

3 files changed, 122 insertions, 20 deletions

diff --git a/crawl-ref/source/dat/elf.des b/crawl-ref/source/dat/elf.des
index 9a4d7b399a..19b962335b 100644
--- a/crawl-ref/source/dat/elf.des
+++ b/crawl-ref/source/dat/elf.des
@@ -227,10 +227,84 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxx@@@xxxx
 ENDMAP
 
 
+##############################################
+# Some orcs on a diplomatic mission (Shiori)
+# They have brought some gold from their mines as a gift
+NAME:    orc_legates
+DEPTH:   Elf:1-2
+SHUFFLE: AB , 34 , 12
+SUBST:   6=4
+SUBST:   0= 0 .:9 9:1
+SUBST:   5= 5 .:9 4:1
+NSUBST:  1= 2:1 / *:.
+NSUBST:  2= 2:2 / *:.
+KITEM:   A= any good_item race:elven
+KITEM:   B= any good_item race:elven
+KMONS:   A= patrolling deep elf knight
+KMONS:   B= patrolling deep elf high priest / patrolling deep elf demonologist
+MONS:    ice dragon, dragon
+MONS:    orc knight / orc sorcerer / orc high priest
+MONS:    orc warrior / orc wizard / orc priest
+MONS:    orc
+ITEM:    q:120 gold / q:60 gold / q:30 gold
+# being able to blink and become invisible, the deep elves do not need a
+# hidden exit in back of their audience chamber.
+MAP
+cccccxxccccc
+c111cGGc222c
+cnnncABcnnnc
+xG00B..A00Gx
+xG00A..B00Gx
+xx00x..x00xx
+xG00.dd.00Gx
+xG...34...Gx
+xx.5x66x5.xx
+xG.555555.Gx
+xG.555555.Gx
+xx++x++x++xx
+ENDMAP
+
+####################################################################
+# A high-level negotiation between orc and deep elf leaders (Shiori)
+NAME:     elf_orc_summit_meeting
+DEPTH:    Elf:6-7
+SHUFFLE: 12 , 45
+NSUBST:  7= 1=7 / *= 7:1 .
+NSUBST:  6= 1=6 D:1 / *= 6 .:1
+SUBST:   3 = 3 .:1
+# the deep elf delegation:
+MONS:    deep elf blademaster / deep elf master archer
+MONS:    deep elf annihilator / deep elf sorcerer / deep elf death mage
+MONS:    deep elf knight / w:1 deep elf high priest / w:1 deep elf demonologist
+# the orcish delegation:
+MONS:    orc warlord / iron troll / w:1 fire giant / w:1 frost giant / w:1 stone giant
+MONS:    orc sorcerer / orc high priest / w:5 ogre-mage
+MONS:    orc knight / rock troll / ettin / w:1 orc sorcerer / w:1 orc high priest
+# the arbiter(s):
+MONS:    great orb of eyes / sphinx
+# The orcs might have a unique with them. He or she will likely be outclassed
+# by the others in attendance, but perhaps has some special testimony to
+# present. None of the uniques really fits in with the deep elves...
+KMONS:   D = Ijyb / Blork the Orc / Urug / Erolcha / Snorg
+MAP
+     xxxx
+    xxGGxx
+ xxxx3776xxxx
+.GxT33..66TxG.
+.xxx3x..x6xxx.
+@+3+331466+6+@
+@+3+332566+6+@
+.xxx3x..x.xxx.
+.GxT33..66TxG.
+ xxxx3776xxxx
+    xxGGxx
+     xxxx
+ENDMAP
+
 
 ############################################################################
 # elf_hall
-
+#
 NAME:    elf_hall
 PLACE:   Elf:7
 ORIENT:  northwest
diff --git a/crawl-ref/source/dat/entry.des b/crawl-ref/source/dat/entry.des
index 712ff5bf21..abdc55c4f1 100644
--- a/crawl-ref/source/dat/entry.des
+++ b/crawl-ref/source/dat/entry.des
@@ -53,8 +53,7 @@ KFEAT: O=floor
 KFEAT: Q=floor
 : end
 
-KMONS: M= human / elf / orc
-#KMONS: M= human / elf / orc, nothing / naga, nothing / centaur, nothing / draconian, nothing / ogre, nothing / minotaur / troll / kobold, mummy / ghoul / w:30 nothing
+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
@@ -136,12 +135,11 @@ xxxx.xxxxx.xxxx
       x+x
 ENDMAP
 
-
 ##############################################
-# Angband town! but this isn't Angband, so all
-# the shops are empty. Well, mostly... (Shiori)
+# Angband town! (Shiori)
 NAME:    angband_town
 ORIENT:  float
+CHANCE:  1
 TAGS:    entry no_rotate
 NSUBST:  { = { / > / .
 NSUBST:  = = 3== / *=x
@@ -233,15 +231,13 @@ ENDMAP
 
 #####################################
 # I am the great and powerful Oz! Pay no attention to the man behind
-# the curtain! (Shiori)
-# ...if you stick close to the wall, you should always be able to
-# avoid the flame clouds.
+# the curtain! ...if you stick close to the wall, you should always be
+# able to avoid the flame clouds.
 NAME:   oz_shiori
-CHANCE: 10000
 TAGS:   entry
 ORIENT: float
 NSUBST: 1 = 1/%
-MONS:   kobold/goblin/hobgoblin
+MONS:   kobold / goblin / hobgoblin
 MARKER: # = lua:fog_machine { \
             pow_max = 5, delay_min = 100, delay_max = 150, \
             size = 5, start_clouds = 1, \
@@ -267,7 +263,6 @@ bbb.b.bbb
 ENDMAP
 
 
-
 ##############################################################################
 # Matthew's entry vaults
 ##############################################################################
diff --git a/crawl-ref/source/dat/orc.des b/crawl-ref/source/dat/orc.des
index ea73826b09..ddb14e6974 100644
--- a/crawl-ref/source/dat/orc.des
+++ b/crawl-ref/source/dat/orc.des
@@ -473,9 +473,10 @@ ENDMAP
 
 ###################################
 # Beogh 1
-NAME: mines1_david
-TAGS: allow_dup
-KFEAT: C = altar_beogh
+NAME:   mines1_david
+TAGS:   allow_dup
+KFEAT:  C = altar_beogh
+CHANCE: 20
 MAP
 ...........
 .xxxx.xxxx.
@@ -492,11 +493,12 @@ ENDMAP
 
 ###################################
 # Beogh 2
-NAME: mines2_david
-TAGS: allow_dup
-KFEAT: C = altar_beogh
-MONS: orc / orc warrior w:1
-SUBST: . = . 1:2
+NAME:  mines2_david
+TAGS:   allow_dup
+KFEAT:  C = altar_beogh
+MONS:   orc / orc warrior w:1
+SUBST:  . = . 1:2
+CHANCE: 20
 MAP
 .......
 .......
@@ -543,3 +545,34 @@ MAP
 !xxx$$xxxx!
  !xxxxxxx!
 ENDMAP
+
+
+##################################################
+# Some deep elves on a diplomatic mission (Shiori)
+# They have brought some of their enchanted armaments as gifts
+NAME:    elf_legates
+DEPTH:   Orc:3-4
+SHUFFLE: 23
+SUBST:   6 : 6 .
+NSUBST:  0 = 3=9. / *=0.
+SUBST:   X = xx. b:2 I:1 $:1 *:1
+MONS:    patrolling orc warlord
+MONS:    patrolling orc sorcerer, patrolling orc high priest
+MONS:    deep elf fighter / deep elf summoner / deep elf conjurer / deep elf priest
+MONS:    deep elf soldier / deep elf mage / deep elf priest
+MONS:    deep elf soldier
+ITEM:    good_item scimitar race:elven / good_item chain mail race:elven
+MAP
+ xxxxx=xxx
+xxXXXI1IXXx
+xX..02.3XXx
+xXX000.00Xx
+xXX000.00Xx
+xX.000.00Xx
+xXX00...0Xx
+xX.X.d4d.Xx
+xXX.65556Xx
+xxXX.6.6XXx
+xxxXX..XXxx
+ xxxx@@@xx
+ENDMAP