Updated level-design.txt.

Moved map markers to mapmark.cc.

Added support for timer markers that remove a feature after a certain timeout.
Need to hook up messaging to Lua.

Added bazaars (need more bazaar layouts).

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

5 files changed, 85 insertions, 5 deletions

diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
new file mode 100644
index 0000000000..94eb6a33ad
--- /dev/null
+++ b/crawl-ref/source/dat/bazaar.des
@@ -0,0 +1,67 @@
+###############################################################################
+# bazaar.des - Bazaar entry vaults and bazaar layouts.
+###############################################################################
+
+###############################################################################
+# Bazaar entries
+
+# Utility functions
+
+lua {{
+    function check_expire_marker(e)
+        if not crawl.one_chance_in(3) then
+            e.marker("O = timer: 1000")
+        end
+    end
+}}
+
+default-depth: D:10-27
+
+###############################################################################
+# Dummy entry
+
+NAME: bzr_entry_dummy
+TAGS: bzr_entry transparent
+ORIENT: float
+: check_expire_marker(_G)
+MAP
+O
+ENDMAP
+
+###############################################################################
+# A simple water entry.
+NAME: bzr_entry_001
+TAGS: bzr_entry no_pool_fixup
+ORIENT: float
+SHUFFLE: wwl
+: check_expire_marker(_G)
+MAP
+ www
+w.w.w
+wwOww
+w.w.w
+ www
+ENDMAP
+
+###############################################################################
+# Bazaar layouts.
+#
+# "encompass" levels are recommended, and can be as small or large as you like.
+# No monsters are pre-placed in bazaars, and monsters do not spawn in bazaars,
+# but you can place monsters in your maps if you know what you're doing.
+
+NAME: bazaar_001
+TAGS: bazaar
+ORIENT: encompass
+KFEAT: A = any shop
+MAP
+xxxxxxxxx
+xxxx>xxxx
+xxx...xxx
+xx..A..xx
+x<.A.A.>x
+xx..A..xx
+xxx...xxx
+xxxx>xxxx
+xxxxxxxxx
+ENDMAP
diff --git a/crawl-ref/source/dat/clua/dungeon.lua b/crawl-ref/source/dat/clua/dungeon.lua
index 281e181931..c7b585952d 100644
--- a/crawl-ref/source/dat/clua/dungeon.lua
+++ b/crawl-ref/source/dat/clua/dungeon.lua
@@ -32,6 +32,7 @@ function dgn_map_meta_wrap(map, tab)
                     return crawl.err_trace(val, map, ...)
                  end
    end
+   meta['_G'] = meta
    meta.wrapped_instance = map
    return meta
 end
diff --git a/crawl-ref/source/dat/clua/loadmaps.lua b/crawl-ref/source/dat/clua/loadmaps.lua
index 7d652d7c81..daefb3e0bb 100644
--- a/crawl-ref/source/dat/clua/loadmaps.lua
+++ b/crawl-ref/source/dat/clua/loadmaps.lua
@@ -7,11 +7,11 @@
 ------------------------------------------------------------------------------
 
 local des_files = {
-   "entry.des", "elf.des", "float.des", "hells.des", "hive.des", "lab.des", 
-   "lair.des", "large.des", "mini.des", "orc.des", "pan.des", "portal.des", 
-   "temple.des", "vaults.des", "zot.des"
+   "bazaar.des", "entry.des", "elf.des", "float.des", "hells.des", "hive.des",
+   "lab.des", "lair.des", "large.des", "mini.des", "orc.des", "pan.des",
+   "portal.des", "temple.des", "vaults.des", "zot.des"
 }
 
 for _, file in ipairs(des_files) do
    dgn.load_des_file(file)
-end
\ No newline at end of file
+end
diff --git a/crawl-ref/source/dat/hells.des b/crawl-ref/source/dat/hells.des
index 81a0ae24c3..05e7d75db8 100644
--- a/crawl-ref/source/dat/hells.des
+++ b/crawl-ref/source/dat/hells.des
@@ -111,7 +111,8 @@ ENDMAP
 NAME: vestibule_of_hell
 PLACE: Hell
 ORIENT: encompass
-MARKER: D=enter_dis, G=enter_gehenna, C=enter_cocytus, T=enter_tartarus
+MARKER: D=feat:enter_dis, G=feat:enter_gehenna, C=feat:enter_cocytus
+MARKER: T=feat:enter_tartarus
 SUBST: D=A, G=A, C=A, T=A
 
 MONS: Geryon
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index f716deb1cf..552846a74f 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -4,6 +4,17 @@
 #                                flavour vaults (tagged by 'lab').
 ###############################################################################
 
+#############################################################################
+# Labyrinth entry vaults
+
+NAME: lab_entry_generic
+TAGS: lab_entry transparent
+DEPTH: 12-26
+ORIENT: float
+MARKER: O = timer:400-600
+MAP
+O
+ENDMAP
 
 #############################################################################
 # Labyrinth exit minivaults