Added Lemuel's bazaar entries. For some reason, testing them with PLACE: D:2

leads to buggy runes, but it works with &L.
I've also begun to remove ORIENT: float from small vaults; I hope that's ok.


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

1 files changed, 77 insertions, 20 deletions

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index 70055766ab..029989cd09 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -100,9 +100,8 @@ default-depth: 10-27
 ###############################################################################
 # Dummy entry
 
-NAME: bzr_entry_dummy
-TAGS: bzr_entry transparent trowel_portal allow_dup
-ORIENT: float
+NAME:   bzr_entry_dummy
+TAGS:   bzr_entry transparent trowel_portal allow_dup
 MARKER: O = lua:bazaar_portal()
 MAP
 O
@@ -110,11 +109,10 @@ ENDMAP
 
 ###############################################################################
 # A simple water entry.
-NAME: bzr_entry_001
-TAGS: bzr_entry no_pool_fixup allow_dup
-ORIENT: float
+NAME:    bzr_entry_001
+TAGS:    bzr_entry no_pool_fixup allow_dup
 SHUFFLE: wwl
-MARKER: O = lua:bazaar_portal()
+MARKER:  O = lua:bazaar_portal()
 MAP
  www
 w.w.w
@@ -125,10 +123,9 @@ ENDMAP
 
 ###############################################################################
 # Some coins to shop with.
-NAME: bzr_entry_002
-TAGS: bzr_entry allow_dup
-ORIENT: float
-SUBST: $=$.
+NAME:   bzr_entry_002
+TAGS:   bzr_entry allow_dup
+SUBST:  $=$.
 MARKER: O = lua:bazaar_portal()
 MAP
 xx.xx
@@ -142,11 +139,10 @@ ENDMAP
 # Many customers
 NAME:    bzr_entry_003
 TAGS:    bzr_entry allow_dup
-ORIENT:  float
 MONS:    human, orc, goblin, kobold
 SUBST:   . = .:150 1
 SHUFFLE: 1234
-MARKER: O = lua:bazaar_portal()
+MARKER:  O = lua:bazaar_portal()
 MAP
  .....
 .......
@@ -157,9 +153,8 @@ ENDMAP
 
 ###############################################################################
 # Safe
-NAME:    bzr_entry_004
-TAGS:    bzr_entry allow_dup
-ORIENT:  float
+NAME:   bzr_entry_004
+TAGS:   bzr_entry allow_dup
 MARKER: O = lua:bazaar_portal()
 MAP
  xxxxx
@@ -173,9 +168,8 @@ ENDMAP
 # Safe 2
 NAME:    bzr_entry_005
 TAGS:    bzr_entry allow_dup
-ORIENT:  float
 SHUFFLE: wwlW
-MARKER: O = lua:bazaar_portal()
+MARKER:  O = lua:bazaar_portal()
 MAP
  wwwww
 wwwwwww
@@ -191,7 +185,7 @@ TAGS:    bzr_entry allow_dup
 ORIENT:  float
 SHUFFLE: XU, TUV
 SUBST:   X=.
-MARKER: O = lua:bazaar_portal()
+MARKER:  O = lua:bazaar_portal()
 MAP
    xxx
   xxOxx
@@ -204,7 +198,6 @@ ENDMAP
 # Portal by the lakeside (jpeg)
 NAME:    bzr_entry_007
 TAGS:    bzr_entry allow_dup no_rotate
-ORIENT:  float
 MONS:    plant
 SHUFFLE: XY
 SUBST:   a = W .
@@ -219,6 +212,70 @@ wwwwwwaaaX.Y.
    wwwwwWa.
 ENDMAP
 
+#########################################
+# Bazaar entry with statue (Lemuel)
+NAME:   statue_bzr
+TAGS:   bzr_entry
+SUBST:  G = G111
+MONS:   orange crystal statue / silver statue / ice statue
+MARKER: O = lua:bazaar_portal()
+MAP
+ @
+cGc
+cOc
+ccc
+ENDMAP
+
+#########################################
+# Freezing bazaar (Lemuel)
+NAME:   freezing_bzr
+TAGS:   bzr_entry
+MARKER: W = lua:fog_machine { cloud_type = "freezing vapour", \
+             pow_min = 1, pow_max = 5, delay_min = 20, delay_max = 30, \
+             size = 1, walk_dist = 3, spread_rate= 20 }
+MARKER: O = lua:bazaar_portal()
+MAP
+  W
+ www
+WwOwW
+ www
+  W
+ENDMAP
+
+#########################################
+# Bazaar in the mist (Lemuel)
+NAME:   bzr_in_the_mist
+TAGS:   bzr_entry
+MARKER: O = lua:fog_machine { cloud_type= "purple smoke", \
+            pow_min = 6, pow_max = 12, delay_min = 15, delay_max = 35, \
+            size = 2, walk_dist = 2, spread_rate= 35 }
+MARKER: O = lua:bazaar_portal()
+MAP
+O
+ENDMAP
+
+#########################################
+# Firewalk (Lemuel)
+NAME:    bzr_firewalk
+TAGS:    bzr_entry uniq_firewalk no_item_gen
+SUBST:   $ : $ .
+MARKER:  * = lua:fog_machine { cloud_type = "flame", \
+             pow_min = 2, pow_max = 4, delay_min = 5, delay_max = 10, \
+             size = 1, walk_dist = 0, spread_rate= 0 }
+SUBST:   * = .
+MARKER:  O = lua:bazaar_portal()
+MAP
+c...$...c
+c.*...*.c
+c...$...c
+c.......c
+c.*.$.*.c
+c.......c
+c...$...c
+c.*...*.c
+c...O...c
+ccccccccc
+ENDMAP
 
 ###############################################################################
 # Bazaar layouts.