From cc91c02130fee12132f9ecc4fa4e2146749a599d Mon Sep 17 00:00:00 2001
From: Guy Halford-Thompson <guyht@me.com>
Date: Thu, 29 Nov 2012 09:58:51 -0800
Subject: [PATCH] hangedman_slaughterboxes must have a pan portal if generated on D24

---
 crawl-ref/source/dat/des/variable/encompass.des |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/dat/des/variable/encompass.des b/crawl-ref/source/dat/des/variable/encompass.des
index 6db4b3b..a104e83 100644
--- a/crawl-ref/source/dat/des/variable/encompass.des
+++ b/crawl-ref/source/dat/des/variable/encompass.des
@@ -469,6 +469,12 @@ SUBST:   ;` = ., :~ = x, T = TTV, U = TUU
 SUBST:   7? = ., 36! = 0, Y : 09, 5 = 09, 4 = 9
 SUBST:   = : ttx2, " : WW', _  = C, @ = G
 NSUBST:  ' = 7:S / 2:# / 6 = S:2 #:1 .:2 / *:.
+# If this is generated on D24 then we need a pan portal
+: if you.absdepth() == 24 then
+KFEAT:   O = enter_pandemonium
+: else
+SUBST: O=^
+: end
 : if you.absdepth() > 20 then
 SUBST:   & : a:45 c:8 vb x:2, a : c:15 vb
 MARKER:  ^ = lua:props_marker { portal=1 }
@@ -529,7 +535,7 @@ xxxxZ......aawWWWwwwwwwwwwaa9.....&.....9aa.x..:xxx;x.x.Zxx
 xxxX'''='..aaa++aaaaaaaaaaaaaaEaaaaaaaNaaaa.:.:x'''';.:.Zxx
 xxX''''''........aaaaaaaaaaaaaaaaaaaaaaaaa..x.x';:;'x.x.Zxx
 xxX''''''=....''''''''''''''''''''''''''....;.x':0:'x.;.Zxx
-xxX'='^'''''.cde''efc''''''''''''LMJ''BAD...x.x';:;'x.x.Zxx
+xxX'='O'''''.cde''efc''''''''''''LMJ''BAD...x.x';:;'x.x.Zxx
 xxX'''""'''=.fgd''dgd''pqn''CDA''KNK''CEA...:.;''''x:.x.Zxx
 xxX'''""^'''.efc''cfe''oro''BEB''JML''DCB...x.x;xxx:..x.Zxx
 xxX''^''''''..'''''''''nqp''ADC'''''''''....;........x;.Zxx
-- 
1.7.1

From 5f43e943af9e7296f0458a16376d880b655083e4 Mon Sep 17 00:00:00 2001
From: Guy Halford-Thompson <guy@guyht@me.com>
Date: Sat, 1 Dec 2012 12:41:55 -0800
Subject: [PATCH] Fixed 0006417, pan (and other) guarenteed portals not being
 generated

The map generator attempts to place portals on map tiles tagged with
'portal', but did not first check to see if a portal had already been
placed there.  This resulted in portals being placed on top of existing
ones.
---
 crawl-ref/source/maps.cc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc
index e5910b8..3e26fd0 100644
--- a/crawl-ref/source/maps.cc
+++ b/crawl-ref/source/maps.cc
@@ -490,7 +490,8 @@ static coord_def _find_minivault_place(
             {
                 coord_def v1((*it)->pos);
                 if ((!check_place || map_place_valid(place.map, v1, place.size))
-                    && _connected_minivault_place(v1, place))
+                    && _connected_minivault_place(v1, place)
+                    && !feat_is_gate(grd(v1)))
                     candidates.push_back(v1);
             }
         }
-- 
1.7.5.4