Reworked Bazaars as a special case of portal vaults. The level-type is now

called portal vault. The dungeon builder bases its behaviour on the
level_type_name, which must be set as the "dst" property on the portal
leading to the bazaar/portal vault.

Added WELCOME: directive to .des files to allow maps to specify a welcome
message when the player enters the level (only relevant to encompass maps).

Readjusted kenku flight speed.

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

1 files changed, 11 insertions, 1 deletions

diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp
index 10b74dcc04..26f736cd23 100644
--- a/crawl-ref/source/util/levcomp.ypp
+++ b/crawl-ref/source/util/levcomp.ypp
@@ -54,7 +54,7 @@ level_range set_range(const char *s, int start, int end)
 
 %token <i>      DEFAULT_DEPTH SHUFFLE SUBST TAGS KFEAT KITEM KMONS
 %token <i>      NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER
-%token <i>      PRELUDE MAIN VALIDATE VETO NSUBST
+%token <i>      PRELUDE MAIN VALIDATE VETO NSUBST WELCOME
 
 %token <i>      COMMA INTEGER CHARACTER
 
@@ -152,6 +152,7 @@ metaline        : place
                 | depth
                 | chance
                 | orientation
+                | welcome
                 | mons
                 | items
                 | marker
@@ -413,6 +414,15 @@ orientation     : ORIENT {}
                 }
                 ;
 
+welcome         : WELCOME STRING
+                {
+                    lc_map.main.add(
+                        yylineno,
+                        make_stringf("welcome(\"%s\")",
+                                     quote_lua_string($2).c_str()));
+                }
+                ;
+
 map_def         : map_lines
                 ;