diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-27 10:59:19 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-09-27 10:59:19 +0000 |
| commit | a5f48b90bfa5f11717385652e57aca472c8b38b7 (patch) | |
| tree | 8ee854a6b1fb8b14259526e9b8b23f9c67df85e9 /crawl-ref/source/util/levcomp.ypp | |
| parent | 4db647cad870c687095ccd6c507d330ad31e05ca (diff) | |
| download | crawl-ref-a5f48b90bfa5f11717385652e57aca472c8b38b7.tar.gz crawl-ref-a5f48b90bfa5f11717385652e57aca472c8b38b7.zip | |
Bumped piety cost for brothers-in-arms and greater healing.
Added COLOUR: directive to maps to allow custom colouring of features
by glyph, and tweaked the strawberry fields variants to use it.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2227 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/util/levcomp.ypp')
| -rw-r--r-- | crawl-ref/source/util/levcomp.ypp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/crawl-ref/source/util/levcomp.ypp b/crawl-ref/source/util/levcomp.ypp index 74cc7ff68f..98b71047b4 100644 --- a/crawl-ref/source/util/levcomp.ypp +++ b/crawl-ref/source/util/levcomp.ypp @@ -53,7 +53,7 @@ level_range set_range(const char *s, int start, int end) %expect 2 %token <i> DEFAULT_DEPTH SHUFFLE SUBST TAGS KFEAT KITEM KMONS KMASK -%token <i> NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER +%token <i> NAME DEPTH ORIENT PLACE CHANCE MONS ITEM MARKER COLOUR %token <i> PRELUDE MAIN VALIDATE VETO NSUBST WELCOME LFLAGS BFLAGS %token <i> COMMA INTEGER CHARACTER @@ -158,6 +158,7 @@ metaline : place | marker | subst | nsubst + | colour | shuffle | tags | lflags @@ -342,11 +343,27 @@ mspec_segment : STRING } ; +colour : COLOUR colour_specifiers { } + ; + +colour_specifiers : colour_specifier { } + | colour_specifiers COMMA colour_specifier { } + ; + +colour_specifier : ITEM_INFO + { + lc_map.main.add( + yylineno, + make_stringf("colour(\"%s\")", + quote_lua_string($1).c_str())); + } + ; + nsubst : NSUBST nsubst_specifiers { } ; -nsubst_specifiers : nsubst_spec - | nsubst_specifiers COMMA nsubst_spec +nsubst_specifiers : nsubst_spec { } + | nsubst_specifiers COMMA nsubst_spec { } ; nsubst_spec : ITEM_INFO |