Adding FTILE/RTILE vault commands for setting per-glyph floor and rock tiles. Most vaults with COLOUR tags now also use FTILE/RTILE.

FLOORCOL, ROCKCOL, FLOORTILE, and ROCKTILE have been renamed to LFLOORCOL, LROCKCOL, LFLOORTILE, and LROCKTILE to emphasize the fact that they are a per-level setting (similar to LFLAGS) and to disambiguate them from COLOUR/FTILE/RTILE.

This change also fixes green water not appearing green outside of the sewers and vaults (like the ice cave) not getting their default tiles set appropriately due to a recent change.


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

1 files changed, 6 insertions, 4 deletions

diff --git a/crawl-ref/source/util/levcomp.lpp b/crawl-ref/source/util/levcomp.lpp
index 6ca7542ce4..9046a1ab95 100644
--- a/crawl-ref/source/util/levcomp.lpp
+++ b/crawl-ref/source/util/levcomp.lpp
@@ -245,10 +245,12 @@ BFLAGS:             { CBEGIN(ARGUMENT); return BFLAGS; }
 SUBST:              { CBEGIN(ITEM_LIST); return SUBST; }
 NSUBST:             { CBEGIN(ITEM_LIST); return NSUBST; }
 COLOUR:             { CBEGIN(ITEM_LIST); return COLOUR; }
-FLOORCOL:           { CBEGIN(ARGUMENT); return FLOORCOL; }
-ROCKCOL:            { CBEGIN(ARGUMENT); return ROCKCOL; }
-FLOORTILE:          { CBEGIN(ARGUMENT); return FLOORTILE; }
-ROCKTILE:           { CBEGIN(ARGUMENT); return ROCKTILE; }
+LFLOORCOL:          { CBEGIN(ARGUMENT); return LFLOORCOL; }
+LROCKCOL:           { CBEGIN(ARGUMENT); return LROCKCOL; }
+LFLOORTILE:         { CBEGIN(ARGUMENT); return LFLOORTILE; }
+LROCKTILE:          { CBEGIN(ARGUMENT); return LROCKTILE; }
+FTILE:              { CBEGIN(ITEM_LIST); return FTILE; }
+RTILE:              { CBEGIN(ITEM_LIST); return RTILE; }
 MONS:               { CBEGIN(MNAME); return MONS; }
 ITEM:               { CBEGIN(ITEM_LIST); return ITEM; }
 MARKER:             { CBEGIN(ARGUMENT); return MARKER; }