From 91a2a28940b8f81ec3542cfd0c7e8f8a8ea00850 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Sat, 22 Aug 2009 02:23:08 +0000
Subject: Fix Shoal:5 not being generated.

Reinstate the distinction between minivaults and regular vaults when placing
maps based on PLACE:, because minivaults cannot be placed before the rest of
the level is built.

Change Shoal huts to be picked by tag instead of PLACE.

Allow DEPTH: to use branch:$.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10591 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/dat/lair.des | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'crawl-ref/source/dat/lair.des')

diff --git a/crawl-ref/source/dat/lair.des b/crawl-ref/source/dat/lair.des
index d4994ded9f..c9b870c43a 100644
--- a/crawl-ref/source/dat/lair.des
+++ b/crawl-ref/source/dat/lair.des
@@ -773,6 +773,7 @@ ENDMAP
 #
 NAME:   Shoal_1
 PLACE:  Shoal:5
+TAGS:   water_ok
 WEIGHT: 0
 MONS:   cyclops, yaktaur, yaktaur captain
 MAP
@@ -812,6 +813,7 @@ ENDMAP
 #
 NAME:   Shoal_2
 PLACE:  Shoal:5
+TAGS:   water_ok
 WEIGHT: 0
 MONS:   cyclops,stone giant
 SUBST:  1 = 1.
@@ -850,6 +852,7 @@ ENDMAP
 #
 NAME:   Shoal_3
 PLACE:  Shoal:5
+TAGS:   water_ok
 WEIGHT: 0
 KMONS:  x : ice statue / orange crystal statue / silver statue
 KFEAT:  x : O
@@ -864,6 +867,7 @@ ENDMAP
 #
 NAME:   Shoal_4
 PLACE:  Shoal:5
+TAGS:   water_ok
 WEIGHT: 0
 KFEAT:  O = w
 ### KITEM: O = liquid rune of Zot
@@ -888,7 +892,7 @@ ENDMAP
 #
 # Shoal:$ is hand-hacked to force lots of minivaults.
 NAME:      shoalhut_rune
-TAGS:      shoal_rune
+TAGS:      shoal_rune water_ok
 SHUFFLE:   ABCD
 SUBST:     A:x, B:x, C:x=, D=+
 LROCKTILE:  wall_vines
@@ -907,8 +911,8 @@ ENDMAP
 #
 # Shoal:$ is hand-hacked to force lots of minivaults.
 NAME:    shoalhut_norune
-PLACE:   Shoal:$
-TAGS:    allow_dup
+DEPTH:   Shoal:$
+TAGS:    allow_dup water_ok shoal
 SHUFFLE: ABCD
 SUBST:   A:x, B:x, C:x=, D=+
 MAP
-- 
cgit v1.2.3-54-g00ecf