Allow vaults to have "nolayout_" tags.

This functionality prohibits vaults from placing on specific layout
types. It's meant to be mutually exclusive with layout_ tags, but
there's nothing stopping you from having both on one vault (I don't
expect consistent behaviour from this, though).

1 files changed, 9 insertions, 2 deletions

diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 6fd2734ced..806b24fef6 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -649,17 +649,24 @@ static map_section_type _apply_vault_definition(
 
 static bool _map_matches_layout_type(const map_def &map)
 {
-    if (env.level_layout_types.empty() || !map.has_tag_prefix("layout_"))
+    bool permissive = false;
+    if (env.level_layout_types.empty()
+        || (!map.has_tag_prefix("layout_")
+            && !(permissive = map.has_tag_prefix("nolayout_"))))
+    {
         return true;
+    }
 
     for (string_set::const_iterator i = env.level_layout_types.begin();
          i != env.level_layout_types.end(); ++i)
     {
         if (map.has_tag("layout_" + *i))
             return true;
+        else if (map.has_tag("nolayout_" + *i))
+            return false;
     }
 
-    return false;
+    return permissive;
 }
 
 static bool _map_matches_species(const map_def &map)