Outsourced the cross and the large octagon room to the (new) layout.des file. The octagon room is especially more random now, with different types, sizes, and numbers of pillars as well as more interesting stair placement.

Vaults with the "layout" tag:
1) Aren't ever chosen as a random vault.
2) Are treated as normal level, so that other vaults can be placed over top.
3) Should probably be encompassing.
4) Currently only occur with the same frequency as the cross/octagon did.

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

1 files changed, 2 insertions, 0 deletions

diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index 665c8e22ad..044ae2a47f 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -361,6 +361,7 @@ int random_map_for_place(const level_id &place, bool want_minivault)
         // We also accept tagged levels here.
         if (vdefs[i].place == place
             && vdefs[i].is_minivault() == want_minivault
+            && !vdefs[i].has_tag("layout")
             && vault_unforbidden(vdefs[i]))
         {
             rollsize += vdefs[i].chance;
@@ -398,6 +399,7 @@ int random_map_in_depth(const level_id &place, bool want_minivault)
             && !vdefs[i].has_tag("pan")
             && !vdefs[i].has_tag("unrand")
             && !vdefs[i].has_tag("bazaar")
+            && !vdefs[i].has_tag("layout")
             && vault_unforbidden(vdefs[i]))
         {
             rollsize += vdefs[i].chance;