Make ziggurat outerwalls permarock. New entry vault.

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

2 files changed, 45 insertions, 25 deletions

diff --git a/crawl-ref/source/dat/clua/ziggurat.lua b/crawl-ref/source/dat/clua/ziggurat.lua
index af47c26bb4..df33ae1aa0 100644
--- a/crawl-ref/source/dat/clua/ziggurat.lua
+++ b/crawl-ref/source/dat/clua/ziggurat.lua
@@ -611,7 +611,7 @@ local function ziggurat_furnish(centre, entry, exit)
 
   local function needs_colour(p)
     return not dgn.in_vault(p.x, p.y)
-      and dgn.grid(p.x, p.y) == dgn.fnum("stone_wall")
+      and dgn.grid(p.x, p.y) == dgn.fnum("permarock_wall")
   end
 
   dgn.colour_map(needs_colour, zig().colour)
@@ -620,7 +620,7 @@ end
 -- builds ziggurat maps consisting of two overimposed rectangles
 local function ziggurat_rectangle_builder(e)
   local grid = dgn.grid
-  dgn.fill_area(0, 0, dgn.GXM - 1, dgn.GYM - 1, "stone_wall")
+  dgn.fill_area(0, 0, dgn.GXM - 1, dgn.GYM - 1, "permarock_wall")
 
   local area = map_area()
   area = math.floor(area*3/4)
@@ -669,7 +669,7 @@ end
 -- a=b*3/2 for zig_exc=100
 local function ziggurat_ellipse_builder(e)
   local grid = dgn.grid
-  dgn.fill_area(0, 0, dgn.GXM - 1, dgn.GYM - 1, "stone_wall")
+  dgn.fill_area(0, 0, dgn.GXM - 1, dgn.GYM - 1, "permarock_wall")
 
   local zig_exc = zig().zig_exc
 
@@ -703,7 +703,7 @@ end
 -- builds hexagonal ziggurat maps
 local function ziggurat_hexagon_builder(e)
   local grid = dgn.grid
-  dgn.fill_area(0, 0, dgn.GXM - 1, dgn.GYM - 1, "stone_wall")
+  dgn.fill_area(0, 0, dgn.GXM - 1, dgn.GYM - 1, "permarock_wall")
 
   local zig_exc = zig().zig_exc
 
diff --git a/crawl-ref/source/dat/ziggurat.des b/crawl-ref/source/dat/ziggurat.des
index 1760abff9a..26967f64bf 100644
--- a/crawl-ref/source/dat/ziggurat.des
+++ b/crawl-ref/source/dat/ziggurat.des
@@ -38,27 +38,6 @@ ENDMAP
 
 NAME:    enter_ziggurat_b
 DEPTH:   D:20-27, Zot, Pan
-MONS:    lich / ancient lich
-MONS:    angel / daeva
-MONS:    eye of draining / eye of devastation / giant eyeball / \
-         great orb of eyes / shining eye
-SHUFFLE: 123
-SUBST:   1=1..., 2=2.
-: ziggurat_portal(_G)
-MAP
-    ...
-   ..n..
-  ..nnn..
- ..nn1nn..
-..nn1O1nn..
- ..nn1nn..
-  ..nnn..
-   ..n..
-    ...
-ENDMAP
-
-NAME:    enter_ziggurat_c
-DEPTH:   D:20-27, Zot, Pan
 TAGS:    no_pool_fixup
 SHUFFLE: wW' / l;_
 COLOUR:  ; = red
@@ -78,6 +57,47 @@ MAP
    ..'..
 ENDMAP
 
+NAME:    enter_ziggurat_c
+DEPTH:   D:20-27, Zot, Pan
+MONS:    lich / ancient lich
+MONS:    angel / daeva
+MONS:    eye of draining / eye of devastation / giant eyeball / \
+         great orb of eyes / shining eye
+SHUFFLE: 123.
+SUBST:   1=1..., 2=2.
+: ziggurat_portal(_G)
+MAP
+    ...
+   ..m..
+  ..mmm..
+ ..mm1mm..
+..mm1O1nn..
+ ..mm1mm..
+  ..mmm..
+   ..m..
+    ...
+ENDMAP
+
+NAME:    enter_ziggurat_d
+DEPTH:   D:20-27, Zot, Pan
+MONS:    lich / ancient lich
+MONS:    angel / daeva
+MONS:    eye of draining / eye of devastation / giant eyeball / \
+         great orb of eyes / shining eye
+SHUFFLE: 123.
+SUBST:   1=1..., 2=2.
+: ziggurat_portal(_G)
+MAP
+    ...
+   ..n..
+  .nnnnn.
+ ..n.1.n..
+..nn1O1nn..
+ ..n.1.n..
+  .nnnnn.
+   ..n..
+    ...
+ENDMAP
 
 #######################################################################
 # Pillars for ziggurats.