Merge branch 'master' into iood

14 files changed, 316 insertions, 54 deletions

diff --git a/crawl-ref/source/dat/clua/lm_fog.lua b/crawl-ref/source/dat/clua/lm_fog.lua
index 17b80e652e..ace95fec53 100644
--- a/crawl-ref/source/dat/clua/lm_fog.lua
+++ b/crawl-ref/source/dat/clua/lm_fog.lua
@@ -52,6 +52,10 @@
 -- start_clouds: The number of clouds to lay when the level containing
 --     the cloud machine is entered.  This is necessary since clouds
 --     are cleared when the player leaves a level.
+-- colour: A string value with which to recolour the cloud.
+-- name: A string value with which to rebrand (specifically, rename) the
+--     cloud in question.
+-- tile: A string value with which to retile the cloud.
 -- listener: A table with a function field called 'func'.  Will be called
 --     whenever the countdown is activated, and whenever the fog
 --     machine is reset. It will be called with a reference to the table,
@@ -100,6 +104,9 @@ function FogMachine:new(pars)
   m.size_max     = pars.size_max     or pars.size
   m.spread_rate  = pars.spread_rate  or -1
   m.start_clouds = pars.start_clouds or 1
+  m.colour       = pars.colour       or ""
+  m.name         = pars.name         or ""
+  m.tile         = pars.tile         or ""
 
   m.size_buildup_amnt   = pars.size_buildup_amnt   or 0
   m.size_buildup_time   = pars.size_buildup_time   or 1
@@ -125,9 +132,10 @@ function FogMachine:new(pars)
 end
 
 function FogMachine:apply_cloud(point, pow_min, pow_max, pow_rolls,
-                                size, cloud_type, kill_cat, spread)
+                                size, cloud_type, kill_cat, spread, colour,
+                                name, tile)
   dgn.apply_area_cloud(point.x, point.y, pow_min, pow_max, pow_rolls, size,
-                       cloud_type, kill_cat, spread)
+                       cloud_type, kill_cat, spread, colour, name, tile)
 end
 
 function FogMachine:do_fog(point)
@@ -165,7 +173,8 @@ function FogMachine:do_fog(point)
 
   self:apply_cloud(p, self.pow_min, self.pow_max, self.pow_rolls,
                    crawl.random_range(size_min, size_max, 1),
-                   self.cloud_type, self.kill_cat, spread)
+                   self.cloud_type, self.kill_cat, spread, self.colour,
+                   self.name, self.tile)
 end
 
 function FogMachine:do_trigger(triggerer, marker, ev)
@@ -225,6 +234,9 @@ function FogMachine:write(marker, th)
   file.marshall(th, self.spread_buildup_amnt)
   file.marshall(th, self.spread_buildup_time)
   file.marshall(th, self.buildup_turns)
+  file.marshall(th, self.colour)
+  file.marshall(th, self.name)
+  file.marshall(th, self.tile)
 end
 
 function FogMachine:read(marker, th)
@@ -245,6 +257,9 @@ function FogMachine:read(marker, th)
   self.spread_buildup_amnt = file.unmarshall_number(th)
   self.spread_buildup_time = file.unmarshall_number(th)
   self.buildup_turns       = file.unmarshall_number(th)
+  self.colour              = file.unmarshall_string(th)
+  self.name                = file.unmarshall_string(th)
+  self.tile                = file.unmarshall_string(th)
 
   setmetatable(self, FogMachine)
 
diff --git a/crawl-ref/source/dat/clua/util.lua b/crawl-ref/source/dat/clua/util.lua
index 5ef063d9fb..d6e842fa7e 100644
--- a/crawl-ref/source/dat/clua/util.lua
+++ b/crawl-ref/source/dat/clua/util.lua
@@ -86,18 +86,12 @@ function util.set(list)
 end
 
 -- Appends the elements in any number of additional tables to the first table.
-function util.append(table, ...)
-  local res = table
+function util.append(first, ...)
+  local res = first
   local tables = { ... }
-  if #tables == 0 then
-    return res
-  elseif #tables == 1 and #res == 0 then
-    return tables[1]
-  else
-    for _, tab in ipairs(tables) do
-      for _, val in ipairs(tab) do
-        table.insert(res, val)
-      end
+  for _, tab in ipairs(tables) do
+    for _, val in ipairs(tab) do
+      table.insert(res, val)
     end
   end
   return res
diff --git a/crawl-ref/source/dat/database/monspeak.txt b/crawl-ref/source/dat/database/monspeak.txt
index 1b63fbcbcd..a9380051ec 100644
--- a/crawl-ref/source/dat/database/monspeak.txt
+++ b/crawl-ref/source/dat/database/monspeak.txt
@@ -2552,6 +2552,56 @@ Louise
 @_mercenary_guard_@
 ### END Louise
 %%%%
+############ MARA ### A powerful demon lord, Lord of Illusions
+Mara
+
+@_Mara_common_@
+
+w:5
+
+@_Mara_rare_@
+%%%%
+_Mara_common_
+
+VISUAL:@The_monster@'s face changes twice.
+
+@The_monster@ says, "I mislead the hearts of men!"
+
+@The_monster@ says, "What good are steel and magic against my illusions?"
+
+# Buddhism
+@The_monster@ says, "Entranced by some poetic flight, are you?"
+
+@The_monster@ says, "Bound art thou by all the snares!"
+
+# And original
+@The_monster@ growls.
+
+VISUAL SPELL:@The_monster@ gestures.
+
+VISUAL SPELL:@The_monster@ points ostentatiously.
+
+SPELL:@The_monster@ weaves an illusion.
+%%%%
+_Mara_rare_
+
+# Lord of Light
+@The_monster@ screams, "Tenfold be your damnation!"
+
+@The_monster@'s features momentarily become yours. "Wouldst slay thyself?"
+
+@The_monster@ says, "I stand as high above you as a star above the ocean's bottom."
+
+@The_monster@ smirks. "I am one who seeks the Path and the Right."
+
+@The_monster@ says, "Thou art lean, ill-favoured, death is in thy neighbourhood!"
+
+@The_monster@ says, "Difficult is the way of exertion, difficult to pass, difficult to enter upon."
+
+@The_monster@ calls, "Stop! In seven days from now the wheel of empire will appear!"
+
+@The_monster@ boasts, "I am lord over the four continents and the two thousand adjacent isles."
+%%%%
 ############ MARGERY ### A powerful sorceress, guarding the ORB
 Margery
 
diff --git a/crawl-ref/source/dat/database/monspell.txt b/crawl-ref/source/dat/database/monspell.txt
index ce3a29d30e..d2dc14d325 100644
--- a/crawl-ref/source/dat/database/monspell.txt
+++ b/crawl-ref/source/dat/database/monspell.txt
@@ -85,6 +85,30 @@ Greater Healing cast
 
 @The_monster@ briefly glows brightly.
 %%%%
+Mislead cast
+
+@The_monster@ weaves an illusion.
+
+@The_monster@ misleads you.
+
+@The_monster@ clouds your mind.
+%%%%
+unseen Mislead cast
+
+Something tries to mislead you!
+
+Something weaves an illusion around you!
+%%%%
+Mara Summon cast
+
+@The_monster@ weaves an illusion.
+
+@The_monster@ shimmers.
+%%%%
+unseen Mara summon cast
+
+Something weaves an illusion!
+%%%%
 Symbol of Torment cast
 
 @The_monster@ calls on the powers of Hell!
diff --git a/crawl-ref/source/dat/database/quotes.txt b/crawl-ref/source/dat/database/quotes.txt
index 436eb7ab71..0f0e8d5920 100644
--- a/crawl-ref/source/dat/database/quotes.txt
+++ b/crawl-ref/source/dat/database/quotes.txt
@@ -756,6 +756,16 @@ dreadful nostrils and making ring waves around him, which can reach many
 miles. Could one doubt that this is the Leviathan of Job?"
     -Jacob Wallenberg, "Min son på galejan", 1781.
 %%%%
+Mara
+
+"This night the Lord of Illusion passed among you, Mara, mighty among
+ dreamers, mighty for ill. He did come upon another who may work with the
+ stuff of dreams in a different way. He did meet with Dharma, who may expel
+ a dreamer from his dream. They did struggle, and the Lord Mara is no more.
+ Why did they struggle, deathgod against illusionist? You say their ways are
+ incomprehensible, being the ways of gods. This is not the answer."
+    -Roger Zelazny, "Lord of Light", 1967
+%%%%
 Menkaure
 
 "Ye men of Egypt, ye have heard your king!
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index 131c577bdb..da05efc32f 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -1042,6 +1042,10 @@ manticore
 
 A hideous cross-breed, bearing the features of a human and a lion, with great bat-like wings. Its tail bristles with spikes that can be loosed at potential prey.
 %%%%
+Mara
+
+This tall and powerful demon is Mara, Lord of Illusions, mighty among dreamers. He is capable of creating intricately detailed illusions, able to mislead even the minds of the mightiest and most brilliant spell-casters.
+%%%%
 merfolk
 
 Half fish, half man, the merfolk are citizens of both water and land, and they'll fiercely protect their chosen territory.
diff --git a/crawl-ref/source/dat/float.des b/crawl-ref/source/dat/float.des
index 17f3cd4b58..493d018b9e 100644
--- a/crawl-ref/source/dat/float.des
+++ b/crawl-ref/source/dat/float.des
@@ -954,8 +954,10 @@ KMONS:  Z = col:gila wizard hd:15 name_descriptor \
         . dagger ego:freezing | dagger ego:flaming | \
         dagger ego:electrocution
 : end
-KITEM:  B = any book
-KITEM:  | = staff of fire / staff of cold / staff of earth / staff of air
+KITEM:  B = randbook disc:air / randbook disc:fire / randbook disc:ice / \
+            randbook disc:earth
+KITEM:  | = staff of fire / staff of cold / staff of earth / staff of air / \
+            quarterstaff unrand:elemental_staff
 MAP
        ccccccccc
       ccE+'''cwcc
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index e54833f85c..fd7c942d23 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -83,9 +83,10 @@ ENDMAP
 
 #############################################################################
 # Green exit
-NAME: labyrinth_green
-TAGS: minotaur generate_loot allow_dup
-MONS: patrolling minotaur
+NAME:   labyrinth_green
+TAGS:   minotaur generate_loot allow_dup
+MONS:   patrolling minotaur
+WEIGHT: 2
 MAP
 ........
 .bbbbbb.
@@ -119,7 +120,7 @@ ENDMAP
 NAME:   labyrinth_hidden_loot
 TAGS:   minotaur generate_loot allow_dup
 MONS:   patrolling minotaur, minotaur zombie
-SUBST:  d = 2%
+SUBST:  d = 2%*
 SUBST:  c : cvv
 MAP
 ............
@@ -183,11 +184,11 @@ WEIGHT:  2
 MAP
 ..............
 .cccccccccccc.
-.g..ddD+.cccc.
+.g.dddD+.cccc.
 .c.ccccc.cccc.
-.g..ddD+.+1<c.
+.g.dddD+.+1<c.
 .c.ccccc.cccc.
-.g..ddD+.cccc.
+.g.dddD+.cccc.
 .cccccccccccc.
 ..............
 ENDMAP
@@ -336,7 +337,7 @@ ENDMAP
 # Baited teleport trap - this is evil!
 NAME:    labyrinth_baited_teleportation_trap
 TAGS:    lab allow_dup
-KFEAT:   Y = teleport trap
+KFEAT:   Y = teleport trap / zot trap / .
 KITEM:   Y = any good_item
 SHUFFLE: cxv
 WEIGHT:  1
@@ -368,6 +369,7 @@ ENDMAP
 # A few monsters: Nothing is as it seems.
 NAME:   labyrinth_single_monster
 TAGS:   lab allow_dup generate_awake
+WEIGHT: 20
 KFEAT:  x = .
 KMONS:  x = trapdoor spider / w:2 wandering mushroom
 MAP
@@ -377,7 +379,7 @@ ENDMAP
 # Death by starvation?
 NAME:   labyrinth_hungry_ghost
 TAGS:   lab allow_dup generate_awake
-WEIGHT: 2
+WEIGHT: 40
 KFEAT:  x = .
 KMONS:  x = hungry ghost
 MAP
diff --git a/crawl-ref/source/dat/mini.des b/crawl-ref/source/dat/mini.des
index 4f61617b69..2927e8362c 100644
--- a/crawl-ref/source/dat/mini.des
+++ b/crawl-ref/source/dat/mini.des
@@ -2667,7 +2667,7 @@ ENDMAP
 #
 NAME:   archer_statue
 DEPTH:  D:8-, Vault, Elf
-MONS:   statue name:archer name_adjective; longbow . arrow q:30
+MONS:   statue tile:mons_archer_statue name:archer name_adjective; longbow . arrow q:30
 MAP
     ccc
 ccccc1ccccc
diff --git a/crawl-ref/source/dat/shoals.des b/crawl-ref/source/dat/shoals.des
index 4983347ecd..2b52eb6ade 100644
--- a/crawl-ref/source/dat/shoals.des
+++ b/crawl-ref/source/dat/shoals.des
@@ -243,13 +243,13 @@ SHUFFLE:   ABCD
 SUBST:     A:x, B:x, C:x=, D=+
 LROCKTILE:  wall_vines
 MAP
-.xxCxx.
+ xxCxx
 xx...xx
 x.....x
 B..O..D
 x.....x
 xx...xx
-.xxAxx
+ xxAxx
 ENDMAP
 
 ################################################################################
@@ -262,11 +262,11 @@ TAGS:    allow_dup water_ok shoal no_dump
 SHUFFLE: ABCD
 SUBST:   A:x, B:x, C:x=, D=+
 MAP
-.xxCxx.
+ xxCxx
 xx...xx
 x.....x
 B..|..D
 x.....x
 xx...xx
-.xxAxx
+ xxAxx
 ENDMAP
diff --git a/crawl-ref/source/dat/temple.des b/crawl-ref/source/dat/temple.des
index 78df580778..20902ec963 100644
--- a/crawl-ref/source/dat/temple.des
+++ b/crawl-ref/source/dat/temple.des
@@ -1000,14 +1000,16 @@ WEIGHT:  5
 SHUFFLE: {([
 MAP
             bbbbb
+            b...b
+            b.(.b
         bbbbb...bbbbb
-        b...b.(.b...b
+        b...bb.bb...b
         b.B.......B.b
-    bbbbb...bbbbb...bbbbb
-    b...bb.bbbbbbbbbb...b
-bbbbb.{.b...bbbbb.....[.bbbbb
-b...b...b.B.......B.b...b...b
-b.B....bb...b...b...bb....B.b
+    bbbbb...b...b...bbbbb
+    b...bb.bb.B.bbbbb...b
+bbbbb.{.b...b...b.....[.bbbbb
+b...b...b.B.bbbbb.B.b...b...b
+b.B....bb...........bb....B.b
 b...b...bbbbb.B.bbbbb...b...b
 bbbbb.B....bb...bb....B.bbbbb
     b...b...bbbbb...b...b
diff --git a/crawl-ref/source/dat/uniques.des b/crawl-ref/source/dat/uniques.des
index 8f301d0ae3..0632db8edb 100644
--- a/crawl-ref/source/dat/uniques.des
+++ b/crawl-ref/source/dat/uniques.des
@@ -95,7 +95,7 @@ ENDMAP
 ################################################################################
 
 NAME:   uniq_agnes
-DEPTH:  14-16, !Lair, !Slime
+DEPTH:  12-18, !Lair, !Slime
 : place_unique(_G, "Agnes")
 
 NAME:   uniq_aizul
@@ -215,6 +215,10 @@ NAME:   uniq_maud
 DEPTH:  14-16
 : place_unique(_G, "Maud")
 
+NAME:   uniq_mara
+DEPTH:  22-27, !Lair, !Slime
+: place_unique(_G, "Mara")
+
 NAME:   uniq_maurice
 DEPTH:  8-9, 10-13, !Lair, !Slime
 : place_unique(_G, "Maurice")
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index cee6e36ea2..274a32e4df 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -230,7 +230,7 @@ ENDMAP
 #
 NAME:   metal_show
 ORIENT: float
-DEPTH:  Vault:3-
+DEPTH:  Vault:3-7
 TAGS:   no_secret_doors no_monster_gen no_item_gen no_wall_fixup
 COLOUR: M = magenta
 COLOUR: K = magenta
@@ -325,7 +325,7 @@ lua_marker('e', portal_desc { teleport_spot=1})
 lua_marker('m', portal_desc { teleport_spot=2})
 }}
 ORIENT:     float
-DEPTH:      Vault:3-
+DEPTH:      Vault:3-7
 TAGS:       no_secret_doors no_monster_gen no_item_gen uniq_the_teleporter \
             patrolling
 COLOUR:     ME = yellow
@@ -489,8 +489,9 @@ ENDMAP
 # tagged vault8_room should just provide loot.  Note that the rooms
 # are not all the same sizes.
 #
+# about 24 |
 NAME:     vault8_rooms
-TAGS:     vault8_quadrant
+TAGS:     vault8_quadrant uniq_vault8_prize
 SHUFFLE:  AC/BD, EG/FH, IKN/MJL
 SUBST:    A=., B=xx=, C=+, D=x, E=+, F=xx=, G=., H=x
 SUBST:    I=., M=xx=, J=x, K=+, N=+, L=xx=
@@ -613,7 +614,7 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Cross Quadrant
-#
+# about 2 |
 NAME: vault8_cross
 TAGS: vault8_quadrant
 NSUBST:  U = 1:. / *:xxxx=
@@ -649,7 +650,7 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Diamond Quadrant
-#
+# about 4 |
 NAME: vault8_diamond
 TAGS: vault8_quadrant
 SHUFFLE: !_
@@ -686,7 +687,7 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Stripes Quadrant
-#
+# about 5 |
 NAME: vault8_stripes
 TAGS: vault8_quadrant
 # double use of Y=Y. and Z=Z. for decreasing variance
@@ -725,7 +726,7 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Clover Quadrant (by Mu.)
-#
+# about 4 |
 NAME:   vault8_clover
 TAGS:   vault8_quadrant
 SUBST:  Q = 8 9 .:20
@@ -761,9 +762,9 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Triangles Quadrant (by Mu.)
-#
+# about 19 |
 NAME:   vault8_triangles
-TAGS:   vault8_quadrant
+TAGS:   vault8_quadrant uniq_vault8_prize
 SUBST:  Q = 8 9 .:20
 NSUBST: ? = 1:O / *:|
 SUBST:  " = =:1 x:99
@@ -781,11 +782,11 @@ x..Q..xx..Q..xx****xx.Q...x
 x......xx.....xx**xx......x
 x....Q..xx..Q.."xxx|Q.....x
 x........xx.....xx||....Q.x
-x......Q.*x"..Q.."x|Q.....x
-x..Q.....**xx.....xx......x
-x......Q.*xxx"..Q..xx.Q...x
+x......Q.|x"..Q.."x|Q.....x
+x..Q.....*|xx.....xx......x
+x......Q.|xxx"..Q..xx.Q...x
 x........xx||xx.....xx....x
-x....Q..xx||||xx..Q..xx.Q.x
+x....Q..xx||||xx..Q..xx.Q|x
 x......xx..Q.Q.xx.....xx||x
 x..Q..xx........xx..Q..xx?x
 x....xx..Q.....Q.xx.....xxx
@@ -798,9 +799,9 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Not Diamond Quadrant (by Mu.)
-#
+# about 8 |
 NAME:   vault8_not_diamond
-TAGS:   vault8_quadrant
+TAGS:   vault8_quadrant 
 SUBST:  Q = 8 9 *:20
 : vault8_loot(_G)
 : vault8_rune(_G)
@@ -832,7 +833,7 @@ ENDMAP
 
 ##############################################################################
 # Vault:8 - Boxes (by Mu.)
-#
+# about 11 |
 NAME:   vault8_boxes
 TAGS:   vault8_quadrant
 NSUBST: a = 1:+ / *:x
@@ -877,6 +878,160 @@ x..........xxexx..........x
   xxxxxxxxxxxxxxxxxxxxxxxxx
 ENDMAP
 
+##############################################################################
+# Vault:8 - Corners Quadrant (by Mu.)
+# about 25 |
+NAME:   vault8_corners
+TAGS:   vault8_quadrant uniq_vault8_prize
+SUBST:  Q = 8 9 .:10
+NSUBST: $ = 1:O / *:$
+SUBST:  $ = | *:20 $
+SUBST:  a = x.
+: vault8_loot(_G)
+: vault8_rune(_G)
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxx
+x$$$$x.......xQQ...x..$$$$x
+x$$$$x.......xQQ...x.x$$$$x
+x$$$$x..xxx..x..x..x.x$$$$x
+x$$$$x..xxx..x..x..x.x$$$$x
+x.xxxx..xxx..x..x..x.xxxxxx
+x.......xxx.....xQQ.......x
+xxxxxx..xxx.....xQQ.......x
+x.......xxxxxxxxxxxxxxxx..x
+x.......xQQ...$$$$xQQ.....x
+x..xxxxxxQQxxx$$$$xQQ.....x
+xQQ.....x..xxx$$$$x..xxxxxx
+xQQ.....x..xxx$$$$x.....QQx
+xxxxxx..x..xxxxxxxx.....QQx
+x.......x..xxxxxxxxxxxxx..x
+x.......x.................x
+x..xxxxxx.................x
+xQQ.....x..xxxxxxxxx.xxxxxx
+xQQ.....x..xxx$$$$xx.x$$$$x
+xxxxxx..x..xxx$$$$xx.x$$$$x
+a.......xQQxxx$$$$xx.x$$$$x
+ .......xQQ...$$$$xx..$$$$x
+  axxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+##############################################################################
+# Vault:8 - Flips Quadrant (by Mu.)
+# about 21 | 
+NAME:   vault8_flips
+TAGS:   vault8_quadrant uniq_vault8_prize
+NSUBST: ; = 3:l / 3:z / 3:a / *:.
+SUBST:  Q = 8 9
+SUBST:  $ = | * $
+KFEAT:  l = teleport trap
+KFEAT:  z = zot trap
+KFEAT:  a = alarm trap
+SUBST:  s = .:250 =:1
+SUBST:  a = x.
+: vault8_loot(_G)
+: vault8_rune(_G)
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxxxx
+xQQQ......................x
+xQQQxxxxxxxxxxxxxxxxxxxxs.x
+xQQQ....................x.x
+x.x.xxxxxxxxxxxxxxxxxxs.x.x
+x.x.xQQQ..............x.x.x
+x.x.xQQQxxxxxxxxxxxxs.x.x.x
+x.x.xQQQ;;;;;;;;$$$$x.x.x.x
+x.x.x.x;;;;;;;;;$$$$x.x.x.x
+x.x.x.x;;;;;;;;;$$$$x.x.x.x
+x.x.x.x;;;;;;;;;$$$$x.x.x.x
+x.x.x.x;;;;;;;;;$$$$x.x.x.x
+x.x.x.x;;;;;;;;;$$$$x.x.x.x
+x.x.x.x$$$$$$$$$$$$$x.x.x.x
+x.x.x.x$$$$$$$$$$$$$x.x.x.x
+x.x.x.x$$$$$$$$$$$$Ox.x.x.x
+x.x.x.sxxxxxxxxxxxxxx.x.x.x
+x.x.x................QQQx.x
+x.x.sxxxxxxxxxxxxxxxxQQQx.x
+x.x..................QQQx.x
+x.sxxxxxxxxxxxxxxxxxxxxxx.a
+x.........................
+xxxxxxxxxxxxxxxxxxxxxxxxa
+ENDMAP
+
+##############################################################################
+# Vault:8 - Construction Quadrant (by Mu.)
+# about 21 |
+NAME:   vault8_construction
+TAGS:   vault8_quadrant uniq_vault8_prize
+SUBST:  Q = 8 9 .
+NSUBST: $ = 1:O / *:$
+SUBST:  $ = |*$.
+SUBST:  c = xnQ.
+NSUBST: D = 1:+ / *:x
+SUBST:  a = xn..
+: vault8_loot(_G)
+: vault8_rune(_G)
+MAP
+  axxxxxxxxxxxxxxxxxxxxxxxx
+ ..c.c.c.c.c.c.c.c.c.c.c.cx
+a.c.c.c.c.c.c.c.c.c.c.c.c.x
+xc.c.c.c.c.c.c.c.c.c.c.c.cx
+x.c.c.c.c.c.c.c.c.c.c.c.c.x
+xc.c.c.c.c.c.c.c.c.c.c.c.cx
+x.c.c.c.c.c.c.c.c.c.c.c.c.x
+xc.c.c.c.c.c.c.c.c.c.c.c.cx
+x.c.c.c.c.c.c.c.c.c.c.c.c.x
+xc.c.c.c.c.c.c.c.c.c.c.c.cx
+x.c.c.c.c.c.c.c.c.c.c.c.c.x
+xDxDxDxDxDxDxDxDxDxDxDxDxDx
+x.........................x
+x.........................x
+x.Qx..x..x..xQx..x..x..xQ.x
+x.........................x
+x.........................x
+xxx+xxxx+xxxx+xxxx+xxxx+xxx
+x$$$$x$$$$$x$$$x$$$$$x$$$$x
+x$$$$x$$$$$x$$$x$$$$$x$$$$x
+x$$$$x$$$$$x$$$x$$$$$x$$$$x
+x$$$$x$$$$$x$$$x$$$$$x$$$$x
+xxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
+##############################################################################
+# Vault:8 - Long Quadrant (by Mu.)
+# about 8 |
+NAME:   vault8_long
+TAGS:   vault8_quadrant
+SUBST:  Q = 8 9 .:10
+NSUBST: $ = 1:O / *:$
+SUBST:  $ = |**$
+SUBST:  a = x.
+: vault8_loot(_G)
+: vault8_rune(_G)
+MAP
+xxxxxxxxxxxxxxxxxxxxxxxxa
+x.........................
+x.........................a
+x.........................x
+x..xxxxxxxxxxxxxxxxxxxxx..x
+x....QQQ............$$$x..x
+x....QQQ............$$$x..x
+x..xxxxxxxxxxxxxxxxxxxxx..x
+x..x$$$............QQQ....x
+x..x$$$............QQQ....x
+x..xxxxxxxxxxxxxxxxxxxxx..x
+x....QQQ............$$$x..x
+x....QQQ............$$$x..x
+x..xxxxxxxxxxxxxxxxxxxxx..x
+x..x$$$............QQQ....x
+x..x$$$............QQQ....x
+x..xxxxxxxxxxxxxxxxxxxxx..x
+x....QQQ............$$$x..x
+x....QQQ............$$$x..x
+x..xxxxxxxxxxxxxxxxxxxxx..x
+x.........................x
+x.........................x
+xxxxxxxxxxxxxxxxxxxxxxxxxxx
+ENDMAP
+
 
 
 ##############################################################################
diff --git a/crawl-ref/source/dat/zot.des b/crawl-ref/source/dat/zot.des
index bdc8ee1d46..4f6d81b319 100644
--- a/crawl-ref/source/dat/zot.des
+++ b/crawl-ref/source/dat/zot.des
@@ -416,7 +416,7 @@ ORIENT:     float
 LFLOORCOL:  lightgrey
 LROCKCOL:   lightgrey
 LFLOORTILE: floor_tomb
-LROCKTILE:  wall_zot_gray
+LROCKTILE:  wall_zot_white
 MAP
 .
 ENDMAP