From c1e0617ebdc091ef77cf7630dd5ec3a50ea19798 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Wed, 29 Aug 2007 05:30:10 +0000
Subject: [PATCH] Minor cosmetic changes with walls and floor tiles,
 re-arranged the stacking order of floor tiles. Other updates are from map
 editor reformatting.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@7036 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 brest/pshops/pshops_main            |  656 ++++-----
 brest/pshops/pshopsinc              | 1170 +++++++--------
 brest/pshops/pshopsinc2             |  149 +-
 brest/shops/a_small_shop            |    6 +-
 brest/shops/buildshop               |    2 +-
 brest/shops/buildshop2              |    2 +-
 brest/sow/sow                       |    2 +-
 brest/sow/sow.1                     |    2 +-
 brest/zorn/castle.basement0         |   16 +-
 brest/zorn/castle.mainfloor         |  230 +--
 brest/zorn/castle.upper.floor.one   | 1162 +++++++--------
 brest/zorn/castle.upper.floor.three | 2060 +++++++++++++--------------
 brest/zorn/castle.upper.floor.two   |   12 +-
 13 files changed, 2740 insertions(+), 2729 deletions(-)

diff --git a/brest/pshops/pshops_main b/brest/pshops/pshops_main
index 09faedd5b..f4f3ef254 100644
--- a/brest/pshops/pshops_main
+++ b/brest/pshops/pshops_main
@@ -61,6 +61,14 @@ arch grass
 x 1
 y 1
 end
+arch courthouse
+name Shop Headquarters
+slaying pshopsinc
+hp 15
+sp 10
+x 1
+y 1
+end
 arch grass
 x 1
 y 2
@@ -81,6 +89,15 @@ arch grass
 x 1
 y 6
 end
+arch guild
+name Private Shop 14
+slaying pshop14/gfloor
+hp 12
+sp 21
+x 1
+y 6
+move_block 0
+end
 arch grass
 x 1
 y 7
@@ -182,6 +199,14 @@ arch grass
 x 4
 y 1
 end
+arch guild
+name Private Shop 1
+slaying pshop1/gfloor
+hp 12
+sp 21
+x 4
+y 1
+end
 arch grass
 x 4
 y 2
@@ -207,6 +232,15 @@ arch grass
 x 4
 y 6
 end
+arch guild
+name Private Shop 15
+slaying pshop15/gfloor
+hp 12
+sp 21
+x 4
+y 6
+move_block 0
+end
 arch grass
 x 4
 y 7
@@ -300,6 +334,14 @@ arch grass
 x 7
 y 1
 end
+arch guild
+name Private Shop 2
+slaying pshop2/gfloor
+hp 12
+sp 21
+x 7
+y 1
+end
 arch grass
 x 7
 y 2
@@ -320,6 +362,15 @@ arch grass
 x 7
 y 6
 end
+arch guild
+name Private Shop 16
+slaying pshop16/gfloor
+hp 12
+sp 21
+x 7
+y 6
+move_block 0
+end
 arch grass
 x 7
 y 7
@@ -417,6 +468,14 @@ arch grass
 x 10
 y 1
 end
+arch guild
+name Private Shop 3
+slaying pshop3/gfloor
+hp 12
+sp 21
+x 10
+y 1
+end
 arch grass
 x 10
 y 2
@@ -437,6 +496,15 @@ arch grass
 x 10
 y 6
 end
+arch guild
+name Private Shop 17
+slaying pshop17/gfloor
+hp 12
+sp 21
+x 10
+y 6
+move_block 0
+end
 arch grass
 x 10
 y 7
@@ -530,6 +598,14 @@ arch grass
 x 13
 y 1
 end
+arch guild
+name Private Shop 4
+slaying pshop4/gfloor
+hp 12
+sp 21
+x 13
+y 1
+end
 arch grass
 x 13
 y 2
@@ -550,6 +626,15 @@ arch grass
 x 13
 y 6
 end
+arch guild
+name Private Shop 18
+slaying pshop18/gfloor
+hp 12
+sp 21
+x 13
+y 6
+move_block 0
+end
 arch grass
 x 13
 y 7
@@ -648,6 +733,14 @@ arch grass
 x 16
 y 1
 end
+arch guild
+name Private Shop 5
+slaying pshop5/gfloor
+hp 12
+sp 21
+x 16
+y 1
+end
 arch grass
 x 16
 y 2
@@ -668,6 +761,15 @@ arch grass
 x 16
 y 6
 end
+arch guild
+name Private Shop 19
+slaying pshop19/gfloor
+hp 12
+sp 21
+x 16
+y 6
+move_block 0
+end
 arch grass
 x 16
 y 7
@@ -761,6 +863,14 @@ arch grass
 x 19
 y 1
 end
+arch guild
+name Private Shop 6
+slaying pshop6/gfloor
+hp 12
+sp 21
+x 19
+y 1
+end
 arch grass
 x 19
 y 2
@@ -781,6 +891,15 @@ arch grass
 x 19
 y 6
 end
+arch guild
+name Private Shop 20
+slaying pshop20/gfloor
+hp 12
+sp 21
+x 19
+y 6
+move_block 0
+end
 arch grass
 x 19
 y 7
@@ -878,6 +997,14 @@ arch grass
 x 22
 y 1
 end
+arch guild
+name Private Shop 7
+slaying pshop7/gfloor
+hp 12
+sp 21
+x 22
+y 1
+end
 arch grass
 x 22
 y 2
@@ -898,6 +1025,15 @@ arch grass
 x 22
 y 6
 end
+arch guild
+name Private Shop 21
+slaying pshop21/gfloor
+hp 12
+sp 21
+x 22
+y 6
+move_block 0
+end
 arch grass
 x 22
 y 7
@@ -991,6 +1127,14 @@ arch grass
 x 25
 y 1
 end
+arch guild
+name Private Shop 8
+slaying pshop8/gfloor
+hp 12
+sp 21
+x 25
+y 1
+end
 arch grass
 x 25
 y 2
@@ -1011,6 +1155,15 @@ arch grass
 x 25
 y 6
 end
+arch guild
+name Private Shop 22
+slaying pshop22/gfloor
+hp 12
+sp 21
+x 25
+y 6
+move_block 0
+end
 arch grass
 x 25
 y 7
@@ -1109,6 +1262,14 @@ arch grass
 x 28
 y 1
 end
+arch guild
+name Private Shop 9
+slaying pshop9/gfloor
+hp 12
+sp 21
+x 28
+y 1
+end
 arch grass
 x 28
 y 2
@@ -1129,6 +1290,15 @@ arch grass
 x 28
 y 6
 end
+arch guild
+name Private Shop 23
+slaying pshop23/gfloor
+hp 12
+sp 21
+x 28
+y 6
+move_block 0
+end
 arch grass
 x 28
 y 7
@@ -1222,6 +1392,14 @@ arch grass
 x 31
 y 1
 end
+arch guild
+name Private Shop 10
+slaying pshop10/gfloor
+hp 12
+sp 21
+x 31
+y 1
+end
 arch grass
 x 31
 y 2
@@ -1242,6 +1420,15 @@ arch grass
 x 31
 y 6
 end
+arch guild
+name Private Shop 24
+slaying pshop24/gfloor
+hp 12
+sp 21
+x 31
+y 6
+move_block 0
+end
 arch grass
 x 31
 y 7
@@ -1339,6 +1526,14 @@ arch grass
 x 34
 y 1
 end
+arch guild
+name Private Shop 11
+slaying pshop11/gfloor
+hp 12
+sp 21
+x 34
+y 1
+end
 arch grass
 x 34
 y 2
@@ -1359,6 +1554,15 @@ arch grass
 x 34
 y 6
 end
+arch guild
+name Private Shop 25
+slaying pshop25/gfloor
+hp 12
+sp 21
+x 34
+y 6
+move_block 0
+end
 arch grass
 x 34
 y 7
@@ -1452,6 +1656,14 @@ arch grass
 x 37
 y 1
 end
+arch guild
+name Private Shop 12
+slaying pshop12/gfloor
+hp 12
+sp 21
+x 37
+y 1
+end
 arch grass
 x 37
 y 2
@@ -1477,6 +1689,15 @@ arch grass
 x 37
 y 6
 end
+arch guild
+name Private Shop 26
+slaying pshop26/gfloor
+hp 12
+sp 21
+x 37
+y 6
+move_block 0
+end
 arch grass
 x 37
 y 7
@@ -1570,6 +1791,14 @@ arch grass
 x 40
 y 1
 end
+arch guild
+name Private Shop 13
+slaying pshop13/gfloor
+hp 12
+sp 21
+x 40
+y 1
+end
 arch grass
 x 40
 y 2
@@ -1598,334 +1827,6 @@ arch grass
 x 40
 y 6
 end
-arch grass
-x 40
-y 7
-end
-arch evergreens
-x 40
-y 8
-end
-arch evergreens
-x 41
-end
-arch grass
-x 41
-y 1
-end
-arch grass
-x 41
-y 2
-end
-arch marble
-x 41
-y 3
-end
-arch marble
-x 41
-y 4
-end
-arch marble
-x 41
-y 5
-end
-arch grass
-x 41
-y 6
-end
-arch grass
-x 41
-y 7
-end
-arch evergreens
-x 41
-y 8
-end
-arch evergreens
-x 42
-end
-arch evergreens
-x 42
-y 1
-end
-arch evergreens
-x 42
-y 2
-end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
-x 42
-y 3
-end
-arch marble
-x 42
-y 3
-end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
-x 42
-y 4
-end
-arch marble
-x 42
-y 4
-end
-arch invis_exit
-slaying ../../world/world_107_123
-hp 21
-sp 24
-x 42
-y 5
-end
-arch marble
-x 42
-y 5
-end
-arch evergreens
-x 42
-y 6
-end
-arch evergreens
-x 42
-y 7
-end
-arch evergreens
-x 42
-y 8
-end
-arch courthouse
-name Shop Headquarters
-slaying pshopsinc
-hp 15
-sp 10
-x 1
-y 1
-end
-arch guild
-name Private Shop 14
-slaying pshop14/gfloor
-hp 12
-sp 21
-x 1
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 1
-slaying pshop1/gfloor
-hp 12
-sp 21
-x 4
-y 1
-end
-arch guild
-name Private Shop 15
-slaying pshop15/gfloor
-hp 12
-sp 21
-x 4
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 2
-slaying pshop2/gfloor
-hp 12
-sp 21
-x 7
-y 1
-end
-arch guild
-name Private Shop 16
-slaying pshop16/gfloor
-hp 12
-sp 21
-x 7
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 3
-slaying pshop3/gfloor
-hp 12
-sp 21
-x 10
-y 1
-end
-arch guild
-name Private Shop 17
-slaying pshop17/gfloor
-hp 12
-sp 21
-x 10
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 4
-slaying pshop4/gfloor
-hp 12
-sp 21
-x 13
-y 1
-end
-arch guild
-name Private Shop 18
-slaying pshop18/gfloor
-hp 12
-sp 21
-x 13
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 5
-slaying pshop5/gfloor
-hp 12
-sp 21
-x 16
-y 1
-end
-arch guild
-name Private Shop 19
-slaying pshop19/gfloor
-hp 12
-sp 21
-x 16
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 6
-slaying pshop6/gfloor
-hp 12
-sp 21
-x 19
-y 1
-end
-arch guild
-name Private Shop 20
-slaying pshop20/gfloor
-hp 12
-sp 21
-x 19
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 7
-slaying pshop7/gfloor
-hp 12
-sp 21
-x 22
-y 1
-end
-arch guild
-name Private Shop 21
-slaying pshop21/gfloor
-hp 12
-sp 21
-x 22
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 8
-slaying pshop8/gfloor
-hp 12
-sp 21
-x 25
-y 1
-end
-arch guild
-name Private Shop 22
-slaying pshop22/gfloor
-hp 12
-sp 21
-x 25
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 9
-slaying pshop9/gfloor
-hp 12
-sp 21
-x 28
-y 1
-end
-arch guild
-name Private Shop 23
-slaying pshop23/gfloor
-hp 12
-sp 21
-x 28
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 10
-slaying pshop10/gfloor
-hp 12
-sp 21
-x 31
-y 1
-end
-arch guild
-name Private Shop 24
-slaying pshop24/gfloor
-hp 12
-sp 21
-x 31
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 11
-slaying pshop11/gfloor
-hp 12
-sp 21
-x 34
-y 1
-end
-arch guild
-name Private Shop 25
-slaying pshop25/gfloor
-hp 12
-sp 21
-x 34
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 12
-slaying pshop12/gfloor
-hp 12
-sp 21
-x 37
-y 1
-end
-arch guild
-name Private Shop 26
-slaying pshop26/gfloor
-hp 12
-sp 21
-x 37
-y 6
-move_block 0
-end
-arch guild
-name Private Shop 13
-slaying pshop13/gfloor
-hp 12
-sp 21
-x 40
-y 1
-end
 arch guild
 name Private Shop 27
 slaying pshop27/gfloor
@@ -1935,3 +1836,102 @@ x 40
 y 6
 move_block 0
 end
+arch grass
+x 40
+y 7
+end
+arch evergreens
+x 40
+y 8
+end
+arch evergreens
+x 41
+end
+arch grass
+x 41
+y 1
+end
+arch grass
+x 41
+y 2
+end
+arch marble
+x 41
+y 3
+end
+arch marble
+x 41
+y 4
+end
+arch marble
+x 41
+y 5
+end
+arch grass
+x 41
+y 6
+end
+arch grass
+x 41
+y 7
+end
+arch evergreens
+x 41
+y 8
+end
+arch evergreens
+x 42
+end
+arch evergreens
+x 42
+y 1
+end
+arch evergreens
+x 42
+y 2
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
+y 3
+end
+arch marble
+x 42
+y 3
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
+y 4
+end
+arch marble
+x 42
+y 4
+end
+arch invis_exit
+slaying ../../world/world_107_123
+hp 21
+sp 24
+x 42
+y 5
+end
+arch marble
+x 42
+y 5
+end
+arch evergreens
+x 42
+y 6
+end
+arch evergreens
+x 42
+y 7
+end
+arch evergreens
+x 42
+y 8
+end
diff --git a/brest/pshops/pshopsinc b/brest/pshops/pshopsinc
index 0a6351dfa..9a11ecd55 100644
--- a/brest/pshops/pshopsinc
+++ b/brest/pshops/pshopsinc
@@ -9,11 +9,14 @@ Creator: majorwoo josh@woosworld.net
 Date:    10/17/2004
 endmsg
 end
+arch dungeon_magic
+end
 arch woodfloor
 end
 arch flagstone_2_2_2
 end
 arch dungeon_magic
+y 1
 end
 arch woodfloor
 y 1
@@ -22,7 +25,7 @@ arch flagstone_2_1_1
 y 1
 end
 arch dungeon_magic
-y 1
+y 2
 end
 arch woodfloor
 y 2
@@ -31,7 +34,7 @@ arch flagstone_2_1_1
 y 2
 end
 arch dungeon_magic
-y 2
+y 3
 end
 arch woodfloor
 y 3
@@ -40,7 +43,7 @@ arch flagstone_2_1_1
 y 3
 end
 arch dungeon_magic
-y 3
+y 4
 end
 arch woodfloor
 y 4
@@ -49,7 +52,7 @@ arch flagstone_2_1_1
 y 4
 end
 arch dungeon_magic
-y 4
+y 5
 end
 arch woodfloor
 y 5
@@ -58,7 +61,7 @@ arch flagstone_2_1_1
 y 5
 end
 arch dungeon_magic
-y 5
+y 6
 end
 arch woodfloor
 y 6
@@ -67,7 +70,7 @@ arch flagstone_2_1_1
 y 6
 end
 arch dungeon_magic
-y 6
+y 7
 end
 arch woodfloor
 y 7
@@ -76,7 +79,7 @@ arch flagstone_2_1_1
 y 7
 end
 arch dungeon_magic
-y 7
+y 8
 end
 arch woodfloor
 y 8
@@ -85,7 +88,7 @@ arch flagstone_2_1_1
 y 8
 end
 arch dungeon_magic
-y 8
+y 9
 end
 arch woodfloor
 y 9
@@ -94,7 +97,7 @@ arch flagstone_2_1_1
 y 9
 end
 arch dungeon_magic
-y 9
+y 10
 end
 arch woodfloor
 y 10
@@ -102,9 +105,6 @@ end
 arch flagstone_2_2_1
 y 10
 end
-arch dungeon_magic
-y 10
-end
 arch blocked
 y 11
 end
@@ -114,6 +114,9 @@ end
 arch blocked
 y 13
 end
+arch dungeon_magic
+x 1
+end
 arch woodfloor
 x 1
 end
@@ -122,22 +125,23 @@ x 1
 end
 arch dungeon_magic
 x 1
+y 1
 end
 arch woodfloor
 x 1
 y 1
 unique 1
 end
-arch dungeon_magic
-x 1
-y 1
-end
 arch key2
 name pshop1 key
 slaying pshop1
 x 1
 y 1
 end
+arch dungeon_magic
+x 1
+y 2
+end
 arch woodfloor
 x 1
 y 2
@@ -151,7 +155,7 @@ connected 1
 end
 arch dungeon_magic
 x 1
-y 2
+y 3
 end
 arch woodfloor
 x 1
@@ -169,7 +173,7 @@ connected 1
 end
 arch dungeon_magic
 x 1
-y 3
+y 4
 end
 arch woodfloor
 x 1
@@ -177,13 +181,9 @@ y 4
 end
 arch dungeon_magic
 x 1
-y 4
-end
-arch woodfloor
-x 1
 y 5
 end
-arch dungeon_magic
+arch woodfloor
 x 1
 y 5
 end
@@ -195,13 +195,17 @@ sp 5
 x 1
 y 5
 end
+arch dungeon_magic
+x 1
+y 6
+end
 arch woodfloor
 x 1
 y 6
 end
 arch dungeon_magic
 x 1
-y 6
+y 7
 end
 arch woodfloor
 x 1
@@ -219,7 +223,7 @@ connected 15
 end
 arch dungeon_magic
 x 1
-y 7
+y 8
 end
 arch woodfloor
 x 1
@@ -233,23 +237,23 @@ connected 15
 end
 arch dungeon_magic
 x 1
-y 8
+y 9
 end
 arch woodfloor
 x 1
 y 9
 unique 1
 end
-arch dungeon_magic
-x 1
-y 9
-end
 arch key2
 name pshop15 key
 slaying pshop15
 x 1
 y 9
 end
+arch dungeon_magic
+x 1
+y 10
+end
 arch woodfloor
 x 1
 y 10
@@ -258,10 +262,6 @@ arch flagstone_2_1_2
 x 1
 y 10
 end
-arch dungeon_magic
-x 1
-y 10
-end
 arch blocked
 x 1
 y 11
@@ -274,6 +274,9 @@ arch blocked
 x 1
 y 13
 end
+arch dungeon_magic
+x 2
+end
 arch woodfloor
 x 2
 end
@@ -282,6 +285,7 @@ x 2
 end
 arch dungeon_magic
 x 2
+y 1
 end
 arch woodfloor
 x 2
@@ -293,7 +297,7 @@ y 1
 end
 arch dungeon_magic
 x 2
-y 1
+y 2
 end
 arch woodfloor
 x 2
@@ -306,7 +310,7 @@ y 2
 end
 arch dungeon_magic
 x 2
-y 2
+y 3
 end
 arch woodfloor
 x 2
@@ -315,7 +319,7 @@ unique 1
 end
 arch dungeon_magic
 x 2
-y 3
+y 4
 end
 arch woodfloor
 x 2
@@ -323,7 +327,7 @@ y 4
 end
 arch dungeon_magic
 x 2
-y 4
+y 5
 end
 arch woodfloor
 x 2
@@ -331,7 +335,7 @@ y 5
 end
 arch dungeon_magic
 x 2
-y 5
+y 6
 end
 arch woodfloor
 x 2
@@ -339,7 +343,7 @@ y 6
 end
 arch dungeon_magic
 x 2
-y 6
+y 7
 end
 arch woodfloor
 x 2
@@ -348,7 +352,7 @@ unique 1
 end
 arch dungeon_magic
 x 2
-y 7
+y 8
 end
 arch woodfloor
 x 2
@@ -361,7 +365,7 @@ y 8
 end
 arch dungeon_magic
 x 2
-y 8
+y 9
 end
 arch woodfloor
 x 2
@@ -373,7 +377,7 @@ y 9
 end
 arch dungeon_magic
 x 2
-y 9
+y 10
 end
 arch woodfloor
 x 2
@@ -383,10 +387,6 @@ arch flagstone_3_1
 x 2
 y 10
 end
-arch dungeon_magic
-x 2
-y 10
-end
 arch blocked
 x 2
 y 11
@@ -399,6 +399,9 @@ arch blocked
 x 2
 y 13
 end
+arch dungeon_magic
+x 3
+end
 arch woodfloor
 x 3
 end
@@ -407,22 +410,23 @@ x 3
 end
 arch dungeon_magic
 x 3
+y 1
 end
 arch woodfloor
 x 3
 y 1
 unique 1
 end
-arch dungeon_magic
-x 3
-y 1
-end
 arch key2
 name pshop2 key
 slaying pshop2
 x 3
 y 1
 end
+arch dungeon_magic
+x 3
+y 2
+end
 arch woodfloor
 x 3
 y 2
@@ -435,7 +439,7 @@ connected 2
 end
 arch dungeon_magic
 x 3
-y 2
+y 3
 end
 arch woodfloor
 x 3
@@ -453,7 +457,7 @@ connected 2
 end
 arch dungeon_magic
 x 3
-y 3
+y 4
 end
 arch woodfloor
 x 3
@@ -461,7 +465,7 @@ y 4
 end
 arch dungeon_magic
 x 3
-y 4
+y 5
 end
 arch woodfloor
 x 3
@@ -469,7 +473,7 @@ y 5
 end
 arch dungeon_magic
 x 3
-y 5
+y 6
 end
 arch woodfloor
 x 3
@@ -477,7 +481,7 @@ y 6
 end
 arch dungeon_magic
 x 3
-y 6
+y 7
 end
 arch woodfloor
 x 3
@@ -495,7 +499,7 @@ connected 16
 end
 arch dungeon_magic
 x 3
-y 7
+y 8
 end
 arch woodfloor
 x 3
@@ -509,23 +513,23 @@ connected 16
 end
 arch dungeon_magic
 x 3
-y 8
+y 9
 end
 arch woodfloor
 x 3
 y 9
 unique 1
 end
-arch dungeon_magic
-x 3
-y 9
-end
 arch key2
 name pshop16 key
 slaying pshop16
 x 3
 y 9
 end
+arch dungeon_magic
+x 3
+y 10
+end
 arch woodfloor
 x 3
 y 10
@@ -534,10 +538,6 @@ arch flagstone_2_1_2
 x 3
 y 10
 end
-arch dungeon_magic
-x 3
-y 10
-end
 arch blocked
 x 3
 y 11
@@ -550,6 +550,9 @@ arch blocked
 x 3
 y 13
 end
+arch dungeon_magic
+x 4
+end
 arch woodfloor
 x 4
 end
@@ -558,6 +561,7 @@ x 4
 end
 arch dungeon_magic
 x 4
+y 1
 end
 arch woodfloor
 x 4
@@ -569,7 +573,7 @@ y 1
 end
 arch dungeon_magic
 x 4
-y 1
+y 2
 end
 arch woodfloor
 x 4
@@ -582,7 +586,7 @@ y 2
 end
 arch dungeon_magic
 x 4
-y 2
+y 3
 end
 arch woodfloor
 x 4
@@ -591,7 +595,7 @@ unique 1
 end
 arch dungeon_magic
 x 4
-y 3
+y 4
 end
 arch woodfloor
 x 4
@@ -599,7 +603,7 @@ y 4
 end
 arch dungeon_magic
 x 4
-y 4
+y 5
 end
 arch woodfloor
 x 4
@@ -607,7 +611,7 @@ y 5
 end
 arch dungeon_magic
 x 4
-y 5
+y 6
 end
 arch woodfloor
 x 4
@@ -615,7 +619,7 @@ y 6
 end
 arch dungeon_magic
 x 4
-y 6
+y 7
 end
 arch woodfloor
 x 4
@@ -624,7 +628,7 @@ unique 1
 end
 arch dungeon_magic
 x 4
-y 7
+y 8
 end
 arch woodfloor
 x 4
@@ -637,7 +641,7 @@ y 8
 end
 arch dungeon_magic
 x 4
-y 8
+y 9
 end
 arch woodfloor
 x 4
@@ -649,7 +653,7 @@ y 9
 end
 arch dungeon_magic
 x 4
-y 9
+y 10
 end
 arch woodfloor
 x 4
@@ -659,10 +663,6 @@ arch flagstone_3_1
 x 4
 y 10
 end
-arch dungeon_magic
-x 4
-y 10
-end
 arch blocked
 x 4
 y 11
@@ -675,6 +675,9 @@ arch blocked
 x 4
 y 13
 end
+arch dungeon_magic
+x 5
+end
 arch woodfloor
 x 5
 end
@@ -683,22 +686,23 @@ x 5
 end
 arch dungeon_magic
 x 5
+y 1
 end
 arch woodfloor
 x 5
 y 1
 unique 1
 end
-arch dungeon_magic
-x 5
-y 1
-end
 arch key2
 name pshop3 key
 slaying pshop3
 x 5
 y 1
 end
+arch dungeon_magic
+x 5
+y 2
+end
 arch woodfloor
 x 5
 y 2
@@ -711,7 +715,7 @@ connected 3
 end
 arch dungeon_magic
 x 5
-y 2
+y 3
 end
 arch woodfloor
 x 5
@@ -729,7 +733,7 @@ connected 3
 end
 arch dungeon_magic
 x 5
-y 3
+y 4
 end
 arch woodfloor
 x 5
@@ -737,7 +741,7 @@ y 4
 end
 arch dungeon_magic
 x 5
-y 4
+y 5
 end
 arch woodfloor
 x 5
@@ -745,7 +749,7 @@ y 5
 end
 arch dungeon_magic
 x 5
-y 5
+y 6
 end
 arch woodfloor
 x 5
@@ -753,7 +757,7 @@ y 6
 end
 arch dungeon_magic
 x 5
-y 6
+y 7
 end
 arch woodfloor
 x 5
@@ -771,7 +775,7 @@ connected 17
 end
 arch dungeon_magic
 x 5
-y 7
+y 8
 end
 arch woodfloor
 x 5
@@ -785,23 +789,23 @@ connected 17
 end
 arch dungeon_magic
 x 5
-y 8
+y 9
 end
 arch woodfloor
 x 5
 y 9
 unique 1
 end
-arch dungeon_magic
-x 5
-y 9
-end
 arch key2
 name pshop17 key
 slaying pshop17
 x 5
 y 9
 end
+arch dungeon_magic
+x 5
+y 10
+end
 arch woodfloor
 x 5
 y 10
@@ -810,10 +814,6 @@ arch flagstone_2_1_2
 x 5
 y 10
 end
-arch dungeon_magic
-x 5
-y 10
-end
 arch blocked
 x 5
 y 11
@@ -826,6 +826,9 @@ arch blocked
 x 5
 y 13
 end
+arch dungeon_magic
+x 6
+end
 arch woodfloor
 x 6
 end
@@ -834,6 +837,7 @@ x 6
 end
 arch dungeon_magic
 x 6
+y 1
 end
 arch woodfloor
 x 6
@@ -845,7 +849,7 @@ y 1
 end
 arch dungeon_magic
 x 6
-y 1
+y 2
 end
 arch woodfloor
 x 6
@@ -858,7 +862,7 @@ y 2
 end
 arch dungeon_magic
 x 6
-y 2
+y 3
 end
 arch woodfloor
 x 6
@@ -867,7 +871,7 @@ unique 1
 end
 arch dungeon_magic
 x 6
-y 3
+y 4
 end
 arch woodfloor
 x 6
@@ -875,7 +879,7 @@ y 4
 end
 arch dungeon_magic
 x 6
-y 4
+y 5
 end
 arch woodfloor
 x 6
@@ -883,7 +887,7 @@ y 5
 end
 arch dungeon_magic
 x 6
-y 5
+y 6
 end
 arch woodfloor
 x 6
@@ -891,7 +895,7 @@ y 6
 end
 arch dungeon_magic
 x 6
-y 6
+y 7
 end
 arch woodfloor
 x 6
@@ -900,7 +904,7 @@ unique 1
 end
 arch dungeon_magic
 x 6
-y 7
+y 8
 end
 arch woodfloor
 x 6
@@ -913,7 +917,7 @@ y 8
 end
 arch dungeon_magic
 x 6
-y 8
+y 9
 end
 arch woodfloor
 x 6
@@ -925,7 +929,7 @@ y 9
 end
 arch dungeon_magic
 x 6
-y 9
+y 10
 end
 arch woodfloor
 x 6
@@ -935,10 +939,6 @@ arch flagstone_3_1
 x 6
 y 10
 end
-arch dungeon_magic
-x 6
-y 10
-end
 arch blocked
 x 6
 y 11
@@ -951,6 +951,9 @@ arch blocked
 x 6
 y 13
 end
+arch dungeon_magic
+x 7
+end
 arch woodfloor
 x 7
 end
@@ -959,22 +962,23 @@ x 7
 end
 arch dungeon_magic
 x 7
+y 1
 end
 arch woodfloor
 x 7
 y 1
 unique 1
 end
-arch dungeon_magic
-x 7
-y 1
-end
 arch key2
 name pshop4 key
 slaying pshop4
 x 7
 y 1
 end
+arch dungeon_magic
+x 7
+y 2
+end
 arch woodfloor
 x 7
 y 2
@@ -987,7 +991,7 @@ connected 4
 end
 arch dungeon_magic
 x 7
-y 2
+y 3
 end
 arch woodfloor
 x 7
@@ -1005,7 +1009,7 @@ connected 4
 end
 arch dungeon_magic
 x 7
-y 3
+y 4
 end
 arch woodfloor
 x 7
@@ -1013,7 +1017,7 @@ y 4
 end
 arch dungeon_magic
 x 7
-y 4
+y 5
 end
 arch woodfloor
 x 7
@@ -1021,7 +1025,7 @@ y 5
 end
 arch dungeon_magic
 x 7
-y 5
+y 6
 end
 arch woodfloor
 x 7
@@ -1029,7 +1033,7 @@ y 6
 end
 arch dungeon_magic
 x 7
-y 6
+y 7
 end
 arch woodfloor
 x 7
@@ -1047,7 +1051,7 @@ connected 18
 end
 arch dungeon_magic
 x 7
-y 7
+y 8
 end
 arch woodfloor
 x 7
@@ -1061,23 +1065,23 @@ connected 18
 end
 arch dungeon_magic
 x 7
-y 8
+y 9
 end
 arch woodfloor
 x 7
 y 9
 unique 1
 end
-arch dungeon_magic
-x 7
-y 9
-end
 arch key2
 name pshop18 key
 slaying pshop18
 x 7
 y 9
 end
+arch dungeon_magic
+x 7
+y 10
+end
 arch woodfloor
 x 7
 y 10
@@ -1086,10 +1090,6 @@ arch flagstone_2_1_2
 x 7
 y 10
 end
-arch dungeon_magic
-x 7
-y 10
-end
 arch blocked
 x 7
 y 11
@@ -1102,6 +1102,9 @@ arch blocked
 x 7
 y 13
 end
+arch dungeon_magic
+x 8
+end
 arch woodfloor
 x 8
 end
@@ -1110,6 +1113,7 @@ x 8
 end
 arch dungeon_magic
 x 8
+y 1
 end
 arch woodfloor
 x 8
@@ -1121,7 +1125,7 @@ y 1
 end
 arch dungeon_magic
 x 8
-y 1
+y 2
 end
 arch woodfloor
 x 8
@@ -1134,7 +1138,7 @@ y 2
 end
 arch dungeon_magic
 x 8
-y 2
+y 3
 end
 arch woodfloor
 x 8
@@ -1143,7 +1147,7 @@ unique 1
 end
 arch dungeon_magic
 x 8
-y 3
+y 4
 end
 arch woodfloor
 x 8
@@ -1151,7 +1155,7 @@ y 4
 end
 arch dungeon_magic
 x 8
-y 4
+y 5
 end
 arch woodfloor
 x 8
@@ -1159,7 +1163,7 @@ y 5
 end
 arch dungeon_magic
 x 8
-y 5
+y 6
 end
 arch woodfloor
 x 8
@@ -1167,7 +1171,7 @@ y 6
 end
 arch dungeon_magic
 x 8
-y 6
+y 7
 end
 arch woodfloor
 x 8
@@ -1176,7 +1180,7 @@ unique 1
 end
 arch dungeon_magic
 x 8
-y 7
+y 8
 end
 arch woodfloor
 x 8
@@ -1189,7 +1193,7 @@ y 8
 end
 arch dungeon_magic
 x 8
-y 8
+y 9
 end
 arch woodfloor
 x 8
@@ -1201,7 +1205,7 @@ y 9
 end
 arch dungeon_magic
 x 8
-y 9
+y 10
 end
 arch woodfloor
 x 8
@@ -1211,10 +1215,6 @@ arch flagstone_3_1
 x 8
 y 10
 end
-arch dungeon_magic
-x 8
-y 10
-end
 arch blocked
 x 8
 y 11
@@ -1227,6 +1227,9 @@ arch blocked
 x 8
 y 13
 end
+arch dungeon_magic
+x 9
+end
 arch woodfloor
 x 9
 end
@@ -1235,22 +1238,23 @@ x 9
 end
 arch dungeon_magic
 x 9
+y 1
 end
 arch woodfloor
 x 9
 y 1
 unique 1
 end
-arch dungeon_magic
-x 9
-y 1
-end
 arch key2
 name pshop5 key
 slaying pshop5
 x 9
 y 1
 end
+arch dungeon_magic
+x 9
+y 2
+end
 arch woodfloor
 x 9
 y 2
@@ -1263,7 +1267,7 @@ connected 5
 end
 arch dungeon_magic
 x 9
-y 2
+y 3
 end
 arch woodfloor
 x 9
@@ -1281,7 +1285,7 @@ connected 5
 end
 arch dungeon_magic
 x 9
-y 3
+y 4
 end
 arch woodfloor
 x 9
@@ -1289,7 +1293,7 @@ y 4
 end
 arch dungeon_magic
 x 9
-y 4
+y 5
 end
 arch woodfloor
 x 9
@@ -1297,7 +1301,7 @@ y 5
 end
 arch dungeon_magic
 x 9
-y 5
+y 6
 end
 arch woodfloor
 x 9
@@ -1305,7 +1309,7 @@ y 6
 end
 arch dungeon_magic
 x 9
-y 6
+y 7
 end
 arch woodfloor
 x 9
@@ -1323,7 +1327,7 @@ connected 19
 end
 arch dungeon_magic
 x 9
-y 7
+y 8
 end
 arch woodfloor
 x 9
@@ -1337,23 +1341,23 @@ connected 19
 end
 arch dungeon_magic
 x 9
-y 8
+y 9
 end
 arch woodfloor
 x 9
 y 9
 unique 1
 end
-arch dungeon_magic
-x 9
-y 9
-end
 arch key2
 name pshop19 key
 slaying pshop19
 x 9
 y 9
 end
+arch dungeon_magic
+x 9
+y 10
+end
 arch woodfloor
 x 9
 y 10
@@ -1362,10 +1366,6 @@ arch flagstone_2_1_2
 x 9
 y 10
 end
-arch dungeon_magic
-x 9
-y 10
-end
 arch blocked
 x 9
 y 11
@@ -1378,6 +1378,9 @@ arch blocked
 x 9
 y 13
 end
+arch dungeon_magic
+x 10
+end
 arch woodfloor
 x 10
 end
@@ -1386,6 +1389,7 @@ x 10
 end
 arch dungeon_magic
 x 10
+y 1
 end
 arch woodfloor
 x 10
@@ -1397,7 +1401,7 @@ y 1
 end
 arch dungeon_magic
 x 10
-y 1
+y 2
 end
 arch woodfloor
 x 10
@@ -1410,7 +1414,7 @@ y 2
 end
 arch dungeon_magic
 x 10
-y 2
+y 3
 end
 arch woodfloor
 x 10
@@ -1419,7 +1423,7 @@ unique 1
 end
 arch dungeon_magic
 x 10
-y 3
+y 4
 end
 arch woodfloor
 x 10
@@ -1427,7 +1431,7 @@ y 4
 end
 arch dungeon_magic
 x 10
-y 4
+y 5
 end
 arch woodfloor
 x 10
@@ -1435,7 +1439,7 @@ y 5
 end
 arch dungeon_magic
 x 10
-y 5
+y 6
 end
 arch woodfloor
 x 10
@@ -1443,7 +1447,7 @@ y 6
 end
 arch dungeon_magic
 x 10
-y 6
+y 7
 end
 arch woodfloor
 x 10
@@ -1452,7 +1456,7 @@ unique 1
 end
 arch dungeon_magic
 x 10
-y 7
+y 8
 end
 arch woodfloor
 x 10
@@ -1465,7 +1469,7 @@ y 8
 end
 arch dungeon_magic
 x 10
-y 8
+y 9
 end
 arch woodfloor
 x 10
@@ -1477,7 +1481,7 @@ y 9
 end
 arch dungeon_magic
 x 10
-y 9
+y 10
 end
 arch woodfloor
 x 10
@@ -1487,10 +1491,6 @@ arch flagstone_3_1
 x 10
 y 10
 end
-arch dungeon_magic
-x 10
-y 10
-end
 arch blocked
 x 10
 y 11
@@ -1503,6 +1503,9 @@ arch blocked
 x 10
 y 13
 end
+arch dungeon_magic
+x 11
+end
 arch woodfloor
 x 11
 end
@@ -1511,22 +1514,23 @@ x 11
 end
 arch dungeon_magic
 x 11
+y 1
 end
 arch woodfloor
 x 11
 y 1
 unique 1
 end
-arch dungeon_magic
-x 11
-y 1
-end
 arch key2
 name pshop6 key
 slaying pshop6
 x 11
 y 1
 end
+arch dungeon_magic
+x 11
+y 2
+end
 arch woodfloor
 x 11
 y 2
@@ -1539,7 +1543,7 @@ connected 6
 end
 arch dungeon_magic
 x 11
-y 2
+y 3
 end
 arch woodfloor
 x 11
@@ -1557,7 +1561,7 @@ connected 6
 end
 arch dungeon_magic
 x 11
-y 3
+y 4
 end
 arch woodfloor
 x 11
@@ -1565,7 +1569,7 @@ y 4
 end
 arch dungeon_magic
 x 11
-y 4
+y 5
 end
 arch woodfloor
 x 11
@@ -1573,7 +1577,7 @@ y 5
 end
 arch dungeon_magic
 x 11
-y 5
+y 6
 end
 arch woodfloor
 x 11
@@ -1581,7 +1585,7 @@ y 6
 end
 arch dungeon_magic
 x 11
-y 6
+y 7
 end
 arch woodfloor
 x 11
@@ -1599,7 +1603,7 @@ connected 20
 end
 arch dungeon_magic
 x 11
-y 7
+y 8
 end
 arch woodfloor
 x 11
@@ -1613,23 +1617,23 @@ connected 20
 end
 arch dungeon_magic
 x 11
-y 8
+y 9
 end
 arch woodfloor
 x 11
 y 9
 unique 1
 end
-arch dungeon_magic
-x 11
-y 9
-end
 arch key2
 name pshop20 key
 slaying pshop20
 x 11
 y 9
 end
+arch dungeon_magic
+x 11
+y 10
+end
 arch woodfloor
 x 11
 y 10
@@ -1638,10 +1642,6 @@ arch flagstone_2_1_2
 x 11
 y 10
 end
-arch dungeon_magic
-x 11
-y 10
-end
 arch blocked
 x 11
 y 11
@@ -1654,6 +1654,9 @@ arch blocked
 x 11
 y 13
 end
+arch dungeon_magic
+x 12
+end
 arch woodfloor
 x 12
 end
@@ -1662,6 +1665,7 @@ x 12
 end
 arch dungeon_magic
 x 12
+y 1
 end
 arch woodfloor
 x 12
@@ -1673,7 +1677,7 @@ y 1
 end
 arch dungeon_magic
 x 12
-y 1
+y 2
 end
 arch woodfloor
 x 12
@@ -1686,7 +1690,7 @@ y 2
 end
 arch dungeon_magic
 x 12
-y 2
+y 3
 end
 arch woodfloor
 x 12
@@ -1695,7 +1699,7 @@ unique 1
 end
 arch dungeon_magic
 x 12
-y 3
+y 4
 end
 arch woodfloor
 x 12
@@ -1703,7 +1707,7 @@ y 4
 end
 arch dungeon_magic
 x 12
-y 4
+y 5
 end
 arch woodfloor
 x 12
@@ -1711,7 +1715,7 @@ y 5
 end
 arch dungeon_magic
 x 12
-y 5
+y 6
 end
 arch woodfloor
 x 12
@@ -1719,7 +1723,7 @@ y 6
 end
 arch dungeon_magic
 x 12
-y 6
+y 7
 end
 arch woodfloor
 x 12
@@ -1728,7 +1732,7 @@ unique 1
 end
 arch dungeon_magic
 x 12
-y 7
+y 8
 end
 arch woodfloor
 x 12
@@ -1741,7 +1745,7 @@ y 8
 end
 arch dungeon_magic
 x 12
-y 8
+y 9
 end
 arch woodfloor
 x 12
@@ -1753,7 +1757,7 @@ y 9
 end
 arch dungeon_magic
 x 12
-y 9
+y 10
 end
 arch woodfloor
 x 12
@@ -1763,10 +1767,6 @@ arch flagstone_3_1
 x 12
 y 10
 end
-arch dungeon_magic
-x 12
-y 10
-end
 arch blocked
 x 12
 y 11
@@ -1779,6 +1779,9 @@ arch blocked
 x 12
 y 13
 end
+arch dungeon_magic
+x 13
+end
 arch woodfloor
 x 13
 end
@@ -1787,22 +1790,23 @@ x 13
 end
 arch dungeon_magic
 x 13
+y 1
 end
 arch woodfloor
 x 13
 y 1
 unique 1
 end
-arch dungeon_magic
-x 13
-y 1
-end
 arch key2
 name pshop7 key
 slaying pshop7
 x 13
 y 1
 end
+arch dungeon_magic
+x 13
+y 2
+end
 arch woodfloor
 x 13
 y 2
@@ -1815,7 +1819,7 @@ connected 7
 end
 arch dungeon_magic
 x 13
-y 2
+y 3
 end
 arch woodfloor
 x 13
@@ -1833,7 +1837,7 @@ connected 7
 end
 arch dungeon_magic
 x 13
-y 3
+y 4
 end
 arch woodfloor
 x 13
@@ -1841,7 +1845,7 @@ y 4
 end
 arch dungeon_magic
 x 13
-y 4
+y 5
 end
 arch woodfloor
 x 13
@@ -1849,7 +1853,7 @@ y 5
 end
 arch dungeon_magic
 x 13
-y 5
+y 6
 end
 arch woodfloor
 x 13
@@ -1857,7 +1861,7 @@ y 6
 end
 arch dungeon_magic
 x 13
-y 6
+y 7
 end
 arch woodfloor
 x 13
@@ -1875,7 +1879,7 @@ connected 21
 end
 arch dungeon_magic
 x 13
-y 7
+y 8
 end
 arch woodfloor
 x 13
@@ -1889,23 +1893,23 @@ connected 21
 end
 arch dungeon_magic
 x 13
-y 8
+y 9
 end
 arch woodfloor
 x 13
 y 9
 unique 1
 end
-arch dungeon_magic
-x 13
-y 9
-end
 arch key2
 name pshop21 key
 slaying pshop21
 x 13
 y 9
 end
+arch dungeon_magic
+x 13
+y 10
+end
 arch woodfloor
 x 13
 y 10
@@ -1914,10 +1918,6 @@ arch flagstone_2_1_2
 x 13
 y 10
 end
-arch dungeon_magic
-x 13
-y 10
-end
 arch blocked
 x 13
 y 11
@@ -1930,6 +1930,9 @@ arch blocked
 x 13
 y 13
 end
+arch dungeon_magic
+x 14
+end
 arch woodfloor
 x 14
 end
@@ -1938,6 +1941,7 @@ x 14
 end
 arch dungeon_magic
 x 14
+y 1
 end
 arch woodfloor
 x 14
@@ -1949,7 +1953,7 @@ y 1
 end
 arch dungeon_magic
 x 14
-y 1
+y 2
 end
 arch woodfloor
 x 14
@@ -1962,7 +1966,7 @@ y 2
 end
 arch dungeon_magic
 x 14
-y 2
+y 3
 end
 arch woodfloor
 x 14
@@ -1971,7 +1975,7 @@ unique 1
 end
 arch dungeon_magic
 x 14
-y 3
+y 4
 end
 arch woodfloor
 x 14
@@ -1979,13 +1983,9 @@ y 4
 end
 arch dungeon_magic
 x 14
-y 4
-end
-arch woodfloor
-x 14
 y 5
 end
-arch dungeon_magic
+arch woodfloor
 x 14
 y 5
 end
@@ -1993,13 +1993,17 @@ arch platinum_converter
 x 14
 y 5
 end
+arch dungeon_magic
+x 14
+y 6
+end
 arch woodfloor
 x 14
 y 6
 end
 arch dungeon_magic
 x 14
-y 6
+y 7
 end
 arch woodfloor
 x 14
@@ -2007,7 +2011,7 @@ y 7
 end
 arch dungeon_magic
 x 14
-y 7
+y 8
 end
 arch woodfloor
 x 14
@@ -2020,7 +2024,7 @@ y 8
 end
 arch dungeon_magic
 x 14
-y 8
+y 9
 end
 arch woodfloor
 x 14
@@ -2032,7 +2036,7 @@ y 9
 end
 arch dungeon_magic
 x 14
-y 9
+y 10
 end
 arch woodfloor
 x 14
@@ -2042,10 +2046,6 @@ arch flagstone_3_1
 x 14
 y 10
 end
-arch dungeon_magic
-x 14
-y 10
-end
 arch blocked
 x 14
 y 11
@@ -2058,6 +2058,9 @@ arch blocked
 x 14
 y 13
 end
+arch dungeon_magic
+x 15
+end
 arch woodfloor
 x 15
 end
@@ -2066,22 +2069,23 @@ x 15
 end
 arch dungeon_magic
 x 15
+y 1
 end
 arch woodfloor
 x 15
 y 1
 unique 1
 end
-arch dungeon_magic
-x 15
-y 1
-end
 arch key2
 name pshop8 key
 slaying pshop8
 x 15
 y 1
 end
+arch dungeon_magic
+x 15
+y 2
+end
 arch woodfloor
 x 15
 y 2
@@ -2094,7 +2098,7 @@ connected 8
 end
 arch dungeon_magic
 x 15
-y 2
+y 3
 end
 arch woodfloor
 x 15
@@ -2112,7 +2116,7 @@ connected 8
 end
 arch dungeon_magic
 x 15
-y 3
+y 4
 end
 arch woodfloor
 x 15
@@ -2120,7 +2124,7 @@ y 4
 end
 arch dungeon_magic
 x 15
-y 4
+y 5
 end
 arch woodfloor
 x 15
@@ -2128,7 +2132,7 @@ y 5
 end
 arch dungeon_magic
 x 15
-y 5
+y 6
 end
 arch woodfloor
 x 15
@@ -2136,7 +2140,7 @@ y 6
 end
 arch dungeon_magic
 x 15
-y 6
+y 7
 end
 arch woodfloor
 x 15
@@ -2144,13 +2148,9 @@ y 7
 end
 arch dungeon_magic
 x 15
-y 7
-end
-arch woodfloor
-x 15
 y 8
 end
-arch dungeon_magic
+arch woodfloor
 x 15
 y 8
 end
@@ -2167,13 +2167,17 @@ endmsg
 x 15
 y 8
 end
+arch dungeon_magic
+x 15
+y 9
+end
 arch woodfloor
 x 15
 y 9
 end
 arch dungeon_magic
 x 15
-y 9
+y 10
 end
 arch woodfloor
 x 15
@@ -2193,10 +2197,6 @@ sp 2
 x 15
 y 10
 end
-arch dungeon_magic
-x 15
-y 10
-end
 arch blocked
 x 15
 y 11
@@ -2209,6 +2209,9 @@ arch blocked
 x 15
 y 13
 end
+arch dungeon_magic
+x 16
+end
 arch woodfloor
 x 16
 end
@@ -2217,6 +2220,7 @@ x 16
 end
 arch dungeon_magic
 x 16
+y 1
 end
 arch woodfloor
 x 16
@@ -2228,7 +2232,7 @@ y 1
 end
 arch dungeon_magic
 x 16
-y 1
+y 2
 end
 arch woodfloor
 x 16
@@ -2241,7 +2245,7 @@ y 2
 end
 arch dungeon_magic
 x 16
-y 2
+y 3
 end
 arch woodfloor
 x 16
@@ -2250,7 +2254,7 @@ unique 1
 end
 arch dungeon_magic
 x 16
-y 3
+y 4
 end
 arch woodfloor
 x 16
@@ -2258,13 +2262,9 @@ y 4
 end
 arch dungeon_magic
 x 16
-y 4
-end
-arch woodfloor
-x 16
 y 5
 end
-arch dungeon_magic
+arch woodfloor
 x 16
 y 5
 end
@@ -2272,13 +2272,17 @@ arch diamond_converter
 x 16
 y 5
 end
+arch dungeon_magic
+x 16
+y 6
+end
 arch woodfloor
 x 16
 y 6
 end
 arch dungeon_magic
 x 16
-y 6
+y 7
 end
 arch woodfloor
 x 16
@@ -2286,7 +2290,7 @@ y 7
 end
 arch dungeon_magic
 x 16
-y 7
+y 8
 end
 arch woodfloor
 x 16
@@ -2299,7 +2303,7 @@ y 8
 end
 arch dungeon_magic
 x 16
-y 8
+y 9
 end
 arch woodfloor
 x 16
@@ -2311,7 +2315,7 @@ y 9
 end
 arch dungeon_magic
 x 16
-y 9
+y 10
 end
 arch woodfloor
 x 16
@@ -2321,10 +2325,6 @@ arch flagstone_3_1
 x 16
 y 10
 end
-arch dungeon_magic
-x 16
-y 10
-end
 arch blocked
 x 16
 y 11
@@ -2337,6 +2337,9 @@ arch blocked
 x 16
 y 13
 end
+arch dungeon_magic
+x 17
+end
 arch woodfloor
 x 17
 end
@@ -2345,22 +2348,23 @@ x 17
 end
 arch dungeon_magic
 x 17
+y 1
 end
 arch woodfloor
 x 17
 y 1
 unique 1
 end
-arch dungeon_magic
-x 17
-y 1
-end
 arch key2
 name pshop9 key
 slaying pshop9
 x 17
 y 1
 end
+arch dungeon_magic
+x 17
+y 2
+end
 arch woodfloor
 x 17
 y 2
@@ -2373,7 +2377,7 @@ connected 9
 end
 arch dungeon_magic
 x 17
-y 2
+y 3
 end
 arch woodfloor
 x 17
@@ -2391,7 +2395,7 @@ connected 9
 end
 arch dungeon_magic
 x 17
-y 3
+y 4
 end
 arch woodfloor
 x 17
@@ -2399,7 +2403,7 @@ y 4
 end
 arch dungeon_magic
 x 17
-y 4
+y 5
 end
 arch woodfloor
 x 17
@@ -2407,7 +2411,7 @@ y 5
 end
 arch dungeon_magic
 x 17
-y 5
+y 6
 end
 arch woodfloor
 x 17
@@ -2415,7 +2419,7 @@ y 6
 end
 arch dungeon_magic
 x 17
-y 6
+y 7
 end
 arch woodfloor
 x 17
@@ -2433,7 +2437,7 @@ connected 22
 end
 arch dungeon_magic
 x 17
-y 7
+y 8
 end
 arch woodfloor
 x 17
@@ -2447,23 +2451,23 @@ connected 22
 end
 arch dungeon_magic
 x 17
-y 8
+y 9
 end
 arch woodfloor
 x 17
 y 9
 unique 1
 end
-arch dungeon_magic
-x 17
-y 9
-end
 arch key2
 name pshop22 key
 slaying pshop22
 x 17
 y 9
 end
+arch dungeon_magic
+x 17
+y 10
+end
 arch woodfloor
 x 17
 y 10
@@ -2472,10 +2476,6 @@ arch flagstone_2_1_2
 x 17
 y 10
 end
-arch dungeon_magic
-x 17
-y 10
-end
 arch blocked
 x 17
 y 11
@@ -2488,6 +2488,9 @@ arch blocked
 x 17
 y 13
 end
+arch dungeon_magic
+x 18
+end
 arch woodfloor
 x 18
 end
@@ -2496,6 +2499,7 @@ x 18
 end
 arch dungeon_magic
 x 18
+y 1
 end
 arch woodfloor
 x 18
@@ -2507,7 +2511,7 @@ y 1
 end
 arch dungeon_magic
 x 18
-y 1
+y 2
 end
 arch woodfloor
 x 18
@@ -2520,7 +2524,7 @@ y 2
 end
 arch dungeon_magic
 x 18
-y 2
+y 3
 end
 arch woodfloor
 x 18
@@ -2529,7 +2533,7 @@ unique 1
 end
 arch dungeon_magic
 x 18
-y 3
+y 4
 end
 arch woodfloor
 x 18
@@ -2537,7 +2541,7 @@ y 4
 end
 arch dungeon_magic
 x 18
-y 4
+y 5
 end
 arch woodfloor
 x 18
@@ -2545,7 +2549,7 @@ y 5
 end
 arch dungeon_magic
 x 18
-y 5
+y 6
 end
 arch woodfloor
 x 18
@@ -2553,7 +2557,7 @@ y 6
 end
 arch dungeon_magic
 x 18
-y 6
+y 7
 end
 arch woodfloor
 x 18
@@ -2562,7 +2566,7 @@ unique 1
 end
 arch dungeon_magic
 x 18
-y 7
+y 8
 end
 arch woodfloor
 x 18
@@ -2575,7 +2579,7 @@ y 8
 end
 arch dungeon_magic
 x 18
-y 8
+y 9
 end
 arch woodfloor
 x 18
@@ -2587,7 +2591,7 @@ y 9
 end
 arch dungeon_magic
 x 18
-y 9
+y 10
 end
 arch woodfloor
 x 18
@@ -2597,10 +2601,6 @@ arch flagstone_3_1
 x 18
 y 10
 end
-arch dungeon_magic
-x 18
-y 10
-end
 arch blocked
 x 18
 y 11
@@ -2613,6 +2613,9 @@ arch blocked
 x 18
 y 13
 end
+arch dungeon_magic
+x 19
+end
 arch woodfloor
 x 19
 end
@@ -2621,22 +2624,23 @@ x 19
 end
 arch dungeon_magic
 x 19
+y 1
 end
 arch woodfloor
 x 19
 y 1
 unique 1
 end
-arch dungeon_magic
-x 19
-y 1
-end
 arch key2
 name pshop10 key
 slaying pshop10
 x 19
 y 1
 end
+arch dungeon_magic
+x 19
+y 2
+end
 arch woodfloor
 x 19
 y 2
@@ -2649,7 +2653,7 @@ connected 10
 end
 arch dungeon_magic
 x 19
-y 2
+y 3
 end
 arch woodfloor
 x 19
@@ -2667,7 +2671,7 @@ connected 10
 end
 arch dungeon_magic
 x 19
-y 3
+y 4
 end
 arch woodfloor
 x 19
@@ -2675,7 +2679,7 @@ y 4
 end
 arch dungeon_magic
 x 19
-y 4
+y 5
 end
 arch woodfloor
 x 19
@@ -2683,7 +2687,7 @@ y 5
 end
 arch dungeon_magic
 x 19
-y 5
+y 6
 end
 arch woodfloor
 x 19
@@ -2691,7 +2695,7 @@ y 6
 end
 arch dungeon_magic
 x 19
-y 6
+y 7
 end
 arch woodfloor
 x 19
@@ -2709,7 +2713,7 @@ connected 23
 end
 arch dungeon_magic
 x 19
-y 7
+y 8
 end
 arch woodfloor
 x 19
@@ -2723,23 +2727,23 @@ connected 23
 end
 arch dungeon_magic
 x 19
-y 8
+y 9
 end
 arch woodfloor
 x 19
 y 9
 unique 1
 end
-arch dungeon_magic
-x 19
-y 9
-end
 arch key2
 name pshop23 key
 slaying pshop23
 x 19
 y 9
 end
+arch dungeon_magic
+x 19
+y 10
+end
 arch woodfloor
 x 19
 y 10
@@ -2748,10 +2752,6 @@ arch flagstone_2_1_2
 x 19
 y 10
 end
-arch dungeon_magic
-x 19
-y 10
-end
 arch blocked
 x 19
 y 11
@@ -2764,6 +2764,9 @@ arch blocked
 x 19
 y 13
 end
+arch dungeon_magic
+x 20
+end
 arch woodfloor
 x 20
 end
@@ -2772,6 +2775,7 @@ x 20
 end
 arch dungeon_magic
 x 20
+y 1
 end
 arch woodfloor
 x 20
@@ -2783,7 +2787,7 @@ y 1
 end
 arch dungeon_magic
 x 20
-y 1
+y 2
 end
 arch woodfloor
 x 20
@@ -2796,7 +2800,7 @@ y 2
 end
 arch dungeon_magic
 x 20
-y 2
+y 3
 end
 arch woodfloor
 x 20
@@ -2805,7 +2809,7 @@ unique 1
 end
 arch dungeon_magic
 x 20
-y 3
+y 4
 end
 arch woodfloor
 x 20
@@ -2813,7 +2817,7 @@ y 4
 end
 arch dungeon_magic
 x 20
-y 4
+y 5
 end
 arch woodfloor
 x 20
@@ -2821,7 +2825,7 @@ y 5
 end
 arch dungeon_magic
 x 20
-y 5
+y 6
 end
 arch woodfloor
 x 20
@@ -2829,7 +2833,7 @@ y 6
 end
 arch dungeon_magic
 x 20
-y 6
+y 7
 end
 arch woodfloor
 x 20
@@ -2838,7 +2842,7 @@ unique 1
 end
 arch dungeon_magic
 x 20
-y 7
+y 8
 end
 arch woodfloor
 x 20
@@ -2851,7 +2855,7 @@ y 8
 end
 arch dungeon_magic
 x 20
-y 8
+y 9
 end
 arch woodfloor
 x 20
@@ -2863,7 +2867,7 @@ y 9
 end
 arch dungeon_magic
 x 20
-y 9
+y 10
 end
 arch woodfloor
 x 20
@@ -2873,10 +2877,6 @@ arch flagstone_3_1
 x 20
 y 10
 end
-arch dungeon_magic
-x 20
-y 10
-end
 arch blocked
 x 20
 y 11
@@ -2889,6 +2889,9 @@ arch blocked
 x 20
 y 13
 end
+arch dungeon_magic
+x 21
+end
 arch woodfloor
 x 21
 end
@@ -2897,22 +2900,23 @@ x 21
 end
 arch dungeon_magic
 x 21
+y 1
 end
 arch woodfloor
 x 21
 y 1
 unique 1
 end
-arch dungeon_magic
-x 21
-y 1
-end
 arch key2
 name pshop11 key
 slaying pshop11
 x 21
 y 1
 end
+arch dungeon_magic
+x 21
+y 2
+end
 arch woodfloor
 x 21
 y 2
@@ -2925,7 +2929,7 @@ connected 11
 end
 arch dungeon_magic
 x 21
-y 2
+y 3
 end
 arch woodfloor
 x 21
@@ -2943,7 +2947,7 @@ connected 11
 end
 arch dungeon_magic
 x 21
-y 3
+y 4
 end
 arch woodfloor
 x 21
@@ -2951,7 +2955,7 @@ y 4
 end
 arch dungeon_magic
 x 21
-y 4
+y 5
 end
 arch woodfloor
 x 21
@@ -2959,7 +2963,7 @@ y 5
 end
 arch dungeon_magic
 x 21
-y 5
+y 6
 end
 arch woodfloor
 x 21
@@ -2967,7 +2971,7 @@ y 6
 end
 arch dungeon_magic
 x 21
-y 6
+y 7
 end
 arch woodfloor
 x 21
@@ -2985,7 +2989,7 @@ connected 24
 end
 arch dungeon_magic
 x 21
-y 7
+y 8
 end
 arch woodfloor
 x 21
@@ -2999,23 +3003,23 @@ connected 24
 end
 arch dungeon_magic
 x 21
-y 8
+y 9
 end
 arch woodfloor
 x 21
 y 9
 unique 1
 end
-arch dungeon_magic
-x 21
-y 9
-end
 arch key2
 name pshop24 key
 slaying pshop24
 x 21
 y 9
 end
+arch dungeon_magic
+x 21
+y 10
+end
 arch woodfloor
 x 21
 y 10
@@ -3024,10 +3028,6 @@ arch flagstone_2_1_2
 x 21
 y 10
 end
-arch dungeon_magic
-x 21
-y 10
-end
 arch blocked
 x 21
 y 11
@@ -3040,6 +3040,9 @@ arch blocked
 x 21
 y 13
 end
+arch dungeon_magic
+x 22
+end
 arch woodfloor
 x 22
 end
@@ -3048,6 +3051,7 @@ x 22
 end
 arch dungeon_magic
 x 22
+y 1
 end
 arch woodfloor
 x 22
@@ -3059,7 +3063,7 @@ y 1
 end
 arch dungeon_magic
 x 22
-y 1
+y 2
 end
 arch woodfloor
 x 22
@@ -3072,7 +3076,7 @@ y 2
 end
 arch dungeon_magic
 x 22
-y 2
+y 3
 end
 arch woodfloor
 x 22
@@ -3081,7 +3085,7 @@ unique 1
 end
 arch dungeon_magic
 x 22
-y 3
+y 4
 end
 arch woodfloor
 x 22
@@ -3089,7 +3093,7 @@ y 4
 end
 arch dungeon_magic
 x 22
-y 4
+y 5
 end
 arch woodfloor
 x 22
@@ -3097,7 +3101,7 @@ y 5
 end
 arch dungeon_magic
 x 22
-y 5
+y 6
 end
 arch woodfloor
 x 22
@@ -3105,7 +3109,7 @@ y 6
 end
 arch dungeon_magic
 x 22
-y 6
+y 7
 end
 arch woodfloor
 x 22
@@ -3114,7 +3118,7 @@ unique 1
 end
 arch dungeon_magic
 x 22
-y 7
+y 8
 end
 arch woodfloor
 x 22
@@ -3127,7 +3131,7 @@ y 8
 end
 arch dungeon_magic
 x 22
-y 8
+y 9
 end
 arch woodfloor
 x 22
@@ -3139,7 +3143,7 @@ y 9
 end
 arch dungeon_magic
 x 22
-y 9
+y 10
 end
 arch woodfloor
 x 22
@@ -3149,10 +3153,6 @@ arch flagstone_3_1
 x 22
 y 10
 end
-arch dungeon_magic
-x 22
-y 10
-end
 arch blocked
 x 22
 y 11
@@ -3165,6 +3165,9 @@ arch blocked
 x 22
 y 13
 end
+arch dungeon_magic
+x 23
+end
 arch woodfloor
 x 23
 end
@@ -3173,22 +3176,23 @@ x 23
 end
 arch dungeon_magic
 x 23
+y 1
 end
 arch woodfloor
 x 23
 y 1
 unique 1
 end
-arch dungeon_magic
-x 23
-y 1
-end
 arch key2
 name pshop12 key
 slaying pshop12
 x 23
 y 1
 end
+arch dungeon_magic
+x 23
+y 2
+end
 arch woodfloor
 x 23
 y 2
@@ -3201,7 +3205,7 @@ connected 12
 end
 arch dungeon_magic
 x 23
-y 2
+y 3
 end
 arch woodfloor
 x 23
@@ -3219,7 +3223,7 @@ connected 12
 end
 arch dungeon_magic
 x 23
-y 3
+y 4
 end
 arch woodfloor
 x 23
@@ -3227,7 +3231,7 @@ y 4
 end
 arch dungeon_magic
 x 23
-y 4
+y 5
 end
 arch woodfloor
 x 23
@@ -3235,7 +3239,7 @@ y 5
 end
 arch dungeon_magic
 x 23
-y 5
+y 6
 end
 arch woodfloor
 x 23
@@ -3243,7 +3247,7 @@ y 6
 end
 arch dungeon_magic
 x 23
-y 6
+y 7
 end
 arch woodfloor
 x 23
@@ -3261,7 +3265,7 @@ connected 25
 end
 arch dungeon_magic
 x 23
-y 7
+y 8
 end
 arch woodfloor
 x 23
@@ -3275,23 +3279,23 @@ connected 25
 end
 arch dungeon_magic
 x 23
-y 8
+y 9
 end
 arch woodfloor
 x 23
 y 9
 unique 1
 end
-arch dungeon_magic
-x 23
-y 9
-end
 arch key2
 name pshop25 key
 slaying pshop25
 x 23
 y 9
 end
+arch dungeon_magic
+x 23
+y 10
+end
 arch woodfloor
 x 23
 y 10
@@ -3300,10 +3304,6 @@ arch flagstone_2_1_2
 x 23
 y 10
 end
-arch dungeon_magic
-x 23
-y 10
-end
 arch blocked
 x 23
 y 11
@@ -3316,6 +3316,9 @@ arch blocked
 x 23
 y 13
 end
+arch dungeon_magic
+x 24
+end
 arch woodfloor
 x 24
 end
@@ -3324,6 +3327,7 @@ x 24
 end
 arch dungeon_magic
 x 24
+y 1
 end
 arch woodfloor
 x 24
@@ -3335,7 +3339,7 @@ y 1
 end
 arch dungeon_magic
 x 24
-y 1
+y 2
 end
 arch woodfloor
 x 24
@@ -3348,7 +3352,7 @@ y 2
 end
 arch dungeon_magic
 x 24
-y 2
+y 3
 end
 arch woodfloor
 x 24
@@ -3357,7 +3361,7 @@ unique 1
 end
 arch dungeon_magic
 x 24
-y 3
+y 4
 end
 arch woodfloor
 x 24
@@ -3365,7 +3369,7 @@ y 4
 end
 arch dungeon_magic
 x 24
-y 4
+y 5
 end
 arch woodfloor
 x 24
@@ -3373,7 +3377,7 @@ y 5
 end
 arch dungeon_magic
 x 24
-y 5
+y 6
 end
 arch woodfloor
 x 24
@@ -3381,7 +3385,7 @@ y 6
 end
 arch dungeon_magic
 x 24
-y 6
+y 7
 end
 arch woodfloor
 x 24
@@ -3390,7 +3394,7 @@ unique 1
 end
 arch dungeon_magic
 x 24
-y 7
+y 8
 end
 arch woodfloor
 x 24
@@ -3403,7 +3407,7 @@ y 8
 end
 arch dungeon_magic
 x 24
-y 8
+y 9
 end
 arch woodfloor
 x 24
@@ -3415,7 +3419,7 @@ y 9
 end
 arch dungeon_magic
 x 24
-y 9
+y 10
 end
 arch woodfloor
 x 24
@@ -3425,10 +3429,6 @@ arch flagstone_3_1
 x 24
 y 10
 end
-arch dungeon_magic
-x 24
-y 10
-end
 arch blocked
 x 24
 y 11
@@ -3441,6 +3441,9 @@ arch blocked
 x 24
 y 13
 end
+arch dungeon_magic
+x 25
+end
 arch woodfloor
 x 25
 end
@@ -3449,22 +3452,23 @@ x 25
 end
 arch dungeon_magic
 x 25
+y 1
 end
 arch woodfloor
 x 25
 y 1
 unique 1
 end
-arch dungeon_magic
-x 25
-y 1
-end
 arch key2
 name pshop13 key
 slaying pshop13
 x 25
 y 1
 end
+arch dungeon_magic
+x 25
+y 2
+end
 arch woodfloor
 x 25
 y 2
@@ -3477,7 +3481,7 @@ connected 13
 end
 arch dungeon_magic
 x 25
-y 2
+y 3
 end
 arch woodfloor
 x 25
@@ -3495,7 +3499,7 @@ connected 13
 end
 arch dungeon_magic
 x 25
-y 3
+y 4
 end
 arch woodfloor
 x 25
@@ -3503,7 +3507,7 @@ y 4
 end
 arch dungeon_magic
 x 25
-y 4
+y 5
 end
 arch woodfloor
 x 25
@@ -3511,7 +3515,7 @@ y 5
 end
 arch dungeon_magic
 x 25
-y 5
+y 6
 end
 arch woodfloor
 x 25
@@ -3519,7 +3523,7 @@ y 6
 end
 arch dungeon_magic
 x 25
-y 6
+y 7
 end
 arch woodfloor
 x 25
@@ -3537,7 +3541,7 @@ connected 26
 end
 arch dungeon_magic
 x 25
-y 7
+y 8
 end
 arch woodfloor
 x 25
@@ -3551,23 +3555,23 @@ connected 26
 end
 arch dungeon_magic
 x 25
-y 8
+y 9
 end
 arch woodfloor
 x 25
 y 9
 unique 1
 end
-arch dungeon_magic
-x 25
-y 9
-end
 arch key2
 name pshop26 key
 slaying pshop26
 x 25
 y 9
 end
+arch dungeon_magic
+x 25
+y 10
+end
 arch woodfloor
 x 25
 y 10
@@ -3576,10 +3580,6 @@ arch flagstone_2_1_2
 x 25
 y 10
 end
-arch dungeon_magic
-x 25
-y 10
-end
 arch blocked
 x 25
 y 11
@@ -3592,6 +3592,9 @@ arch blocked
 x 25
 y 13
 end
+arch dungeon_magic
+x 26
+end
 arch woodfloor
 x 26
 end
@@ -3600,6 +3603,7 @@ x 26
 end
 arch dungeon_magic
 x 26
+y 1
 end
 arch woodfloor
 x 26
@@ -3611,7 +3615,7 @@ y 1
 end
 arch dungeon_magic
 x 26
-y 1
+y 2
 end
 arch woodfloor
 x 26
@@ -3624,7 +3628,7 @@ y 2
 end
 arch dungeon_magic
 x 26
-y 2
+y 3
 end
 arch woodfloor
 x 26
@@ -3633,7 +3637,7 @@ unique 1
 end
 arch dungeon_magic
 x 26
-y 3
+y 4
 end
 arch woodfloor
 x 26
@@ -3641,7 +3645,7 @@ y 4
 end
 arch dungeon_magic
 x 26
-y 4
+y 5
 end
 arch woodfloor
 x 26
@@ -3649,7 +3653,7 @@ y 5
 end
 arch dungeon_magic
 x 26
-y 5
+y 6
 end
 arch woodfloor
 x 26
@@ -3657,7 +3661,7 @@ y 6
 end
 arch dungeon_magic
 x 26
-y 6
+y 7
 end
 arch woodfloor
 x 26
@@ -3666,7 +3670,7 @@ unique 1
 end
 arch dungeon_magic
 x 26
-y 7
+y 8
 end
 arch woodfloor
 x 26
@@ -3679,7 +3683,7 @@ y 8
 end
 arch dungeon_magic
 x 26
-y 8
+y 9
 end
 arch woodfloor
 x 26
@@ -3691,7 +3695,7 @@ y 9
 end
 arch dungeon_magic
 x 26
-y 9
+y 10
 end
 arch woodfloor
 x 26
@@ -3701,10 +3705,6 @@ arch flagstone_3_1
 x 26
 y 10
 end
-arch dungeon_magic
-x 26
-y 10
-end
 arch blocked
 x 26
 y 11
@@ -3717,6 +3717,9 @@ arch blocked
 x 26
 y 13
 end
+arch dungeon_magic
+x 27
+end
 arch woodfloor
 x 27
 end
@@ -3725,22 +3728,23 @@ x 27
 end
 arch dungeon_magic
 x 27
+y 1
 end
 arch woodfloor
 x 27
 y 1
 unique 1
 end
-arch dungeon_magic
-x 27
-y 1
-end
 arch key2
 name pshop14 key
 slaying pshop14
 x 27
 y 1
 end
+arch dungeon_magic
+x 27
+y 2
+end
 arch woodfloor
 x 27
 y 2
@@ -3753,7 +3757,7 @@ connected 14
 end
 arch dungeon_magic
 x 27
-y 2
+y 3
 end
 arch woodfloor
 x 27
@@ -3771,7 +3775,7 @@ connected 14
 end
 arch dungeon_magic
 x 27
-y 3
+y 4
 end
 arch woodfloor
 x 27
@@ -3779,7 +3783,7 @@ y 4
 end
 arch dungeon_magic
 x 27
-y 4
+y 5
 end
 arch woodfloor
 x 27
@@ -3787,7 +3791,7 @@ y 5
 end
 arch dungeon_magic
 x 27
-y 5
+y 6
 end
 arch woodfloor
 x 27
@@ -3795,7 +3799,7 @@ y 6
 end
 arch dungeon_magic
 x 27
-y 6
+y 7
 end
 arch woodfloor
 x 27
@@ -3813,7 +3817,7 @@ connected 27
 end
 arch dungeon_magic
 x 27
-y 7
+y 8
 end
 arch woodfloor
 x 27
@@ -3827,23 +3831,23 @@ connected 27
 end
 arch dungeon_magic
 x 27
-y 8
+y 9
 end
 arch woodfloor
 x 27
 y 9
 unique 1
 end
-arch dungeon_magic
-x 27
-y 9
-end
 arch key2
 name pshop27 key
 slaying pshop27
 x 27
 y 9
 end
+arch dungeon_magic
+x 27
+y 10
+end
 arch woodfloor
 x 27
 y 10
@@ -3852,10 +3856,6 @@ arch flagstone_2_1_2
 x 27
 y 10
 end
-arch dungeon_magic
-x 27
-y 10
-end
 arch blocked
 x 27
 y 11
@@ -3868,15 +3868,19 @@ arch blocked
 x 27
 y 13
 end
-arch woodfloor
+arch dungeon_magic
 x 28
 end
-arch dungeon_magic
+arch woodfloor
 x 28
 end
 arch flagstone_3_3
 x 28
 end
+arch dungeon_magic
+x 28
+y 1
+end
 arch woodfloor
 x 28
 y 1
@@ -3887,7 +3891,7 @@ y 1
 end
 arch dungeon_magic
 x 28
-y 1
+y 2
 end
 arch woodfloor
 x 28
@@ -3899,13 +3903,9 @@ y 2
 end
 arch dungeon_magic
 x 28
-y 2
-end
-arch woodfloor
-x 28
 y 3
 end
-arch dungeon_magic
+arch woodfloor
 x 28
 y 3
 end
@@ -3913,6 +3913,10 @@ arch flagstone_2_2_1
 x 28
 y 3
 end
+arch dungeon_magic
+x 28
+y 4
+end
 arch magic_mouth
 name Elite Dragon Guard
 msg
@@ -3926,10 +3930,6 @@ arch woodfloor
 x 28
 y 4
 end
-arch dungeon_magic
-x 28
-y 4
-end
 arch dun0
 name Elite Dragon Guard
 face pl_dragon_bl.151
@@ -3953,11 +3953,11 @@ y 5
 move_block 0
 can_roll 0
 end
-arch woodfloor
+arch dungeon_magic
 x 28
 y 6
 end
-arch dungeon_magic
+arch woodfloor
 x 28
 y 6
 end
@@ -3968,11 +3968,11 @@ x 28
 y 6
 blocksview 0
 end
-arch woodfloor
+arch dungeon_magic
 x 28
 y 7
 end
-arch dungeon_magic
+arch woodfloor
 x 28
 y 7
 end
@@ -3980,6 +3980,10 @@ arch flagstone_2_2_2
 x 28
 y 7
 end
+arch dungeon_magic
+x 28
+y 8
+end
 arch woodfloor
 x 28
 y 8
@@ -3990,7 +3994,7 @@ y 8
 end
 arch dungeon_magic
 x 28
-y 8
+y 9
 end
 arch woodfloor
 x 28
@@ -4000,10 +4004,6 @@ arch flagstone_2_1_1
 x 28
 y 9
 end
-arch dungeon_magic
-x 28
-y 9
-end
 arch woodfloor
 x 28
 y 10
@@ -4028,15 +4028,19 @@ arch blocked
 x 28
 y 13
 end
-arch woodfloor2
+arch dungeon_magic
 x 29
 end
-arch dungeon_magic
+arch woodfloor2
 x 29
 end
 arch flagstone_3_3
 x 29
 end
+arch dungeon_magic
+x 29
+y 1
+end
 arch woodfloor2
 x 29
 y 1
@@ -4047,7 +4051,7 @@ y 1
 end
 arch dungeon_magic
 x 29
-y 1
+y 2
 end
 arch woodfloor2
 x 29
@@ -4059,13 +4063,9 @@ y 2
 end
 arch dungeon_magic
 x 29
-y 2
-end
-arch woodfloor2
-x 29
 y 3
 end
-arch dungeon_magic
+arch woodfloor2
 x 29
 y 3
 end
@@ -4073,11 +4073,11 @@ arch flagstone_3_4
 x 29
 y 3
 end
-arch woodfloor2
+arch dungeon_magic
 x 29
 y 4
 end
-arch dungeon_magic
+arch woodfloor2
 x 29
 y 4
 end
@@ -4085,11 +4085,11 @@ arch flagstone_1_2
 x 29
 y 4
 end
-arch woodfloor2
+arch dungeon_magic
 x 29
 y 5
 end
-arch dungeon_magic
+arch woodfloor2
 x 29
 y 5
 end
@@ -4098,11 +4098,11 @@ name Managers Office
 x 29
 y 5
 end
-arch woodfloor2
+arch dungeon_magic
 x 29
 y 6
 end
-arch dungeon_magic
+arch woodfloor2
 x 29
 y 6
 end
@@ -4110,11 +4110,11 @@ arch flagstone_1_1
 x 29
 y 6
 end
-arch woodfloor2
+arch dungeon_magic
 x 29
 y 7
 end
-arch dungeon_magic
+arch woodfloor2
 x 29
 y 7
 end
@@ -4122,6 +4122,10 @@ arch flagstone_3_4
 x 29
 y 7
 end
+arch dungeon_magic
+x 29
+y 8
+end
 arch woodfloor2
 x 29
 y 8
@@ -4132,7 +4136,7 @@ y 8
 end
 arch dungeon_magic
 x 29
-y 8
+y 9
 end
 arch woodfloor2
 x 29
@@ -4142,10 +4146,6 @@ arch flagstone_2_1_1
 x 29
 y 9
 end
-arch dungeon_magic
-x 29
-y 9
-end
 arch woodfloor2
 x 29
 y 10
@@ -4170,6 +4170,9 @@ arch blocked
 x 29
 y 13
 end
+arch dungeon_magic
+x 30
+end
 arch woodfloor2
 x 30
 end
@@ -4178,12 +4181,9 @@ x 30
 end
 arch dungeon_magic
 x 30
-end
-arch woodfloor2
-x 30
 y 1
 end
-arch dungeon_magic
+arch woodfloor2
 x 30
 y 1
 end
@@ -4194,17 +4194,13 @@ sp 1
 x 30
 y 1
 end
-arch woodfloor2
-x 30
-y 2
-end
 arch dungeon_magic
 x 30
 y 2
 end
 arch woodfloor2
 x 30
-y 3
+y 2
 end
 arch dungeon_magic
 x 30
@@ -4212,7 +4208,7 @@ y 3
 end
 arch woodfloor2
 x 30
-y 4
+y 3
 end
 arch dungeon_magic
 x 30
@@ -4220,6 +4216,14 @@ y 4
 end
 arch woodfloor2
 x 30
+y 4
+end
+arch dungeon_magic
+x 30
+y 5
+end
+arch woodfloor2
+x 30
 y 5
 end
 arch rock
@@ -4232,7 +4236,7 @@ can_roll 0
 end
 arch dungeon_magic
 x 30
-y 5
+y 6
 end
 arch woodfloor2
 x 30
@@ -4240,7 +4244,7 @@ y 6
 end
 arch dungeon_magic
 x 30
-y 6
+y 7
 end
 arch woodfloor2
 x 30
@@ -4248,7 +4252,7 @@ y 7
 end
 arch dungeon_magic
 x 30
-y 7
+y 8
 end
 arch woodfloor2
 x 30
@@ -4256,7 +4260,7 @@ y 8
 end
 arch dungeon_magic
 x 30
-y 8
+y 9
 end
 arch woodfloor2
 x 30
@@ -4268,7 +4272,7 @@ y 9
 end
 arch dungeon_magic
 x 30
-y 9
+y 10
 end
 arch woodfloor2
 x 30
@@ -4278,10 +4282,6 @@ arch flagstone_2_1_2
 x 30
 y 10
 end
-arch dungeon_magic
-x 30
-y 10
-end
 arch blocked
 x 30
 y 11
@@ -4294,6 +4294,9 @@ arch blocked
 x 30
 y 13
 end
+arch dungeon_magic
+x 31
+end
 arch woodfloor2
 x 31
 end
@@ -4302,6 +4305,7 @@ x 31
 end
 arch dungeon_magic
 x 31
+y 1
 end
 arch woodfloor2
 x 31
@@ -4314,7 +4318,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 31
-y 1
+y 2
 end
 arch woodfloor2
 x 31
@@ -4322,7 +4326,7 @@ y 2
 end
 arch dungeon_magic
 x 31
-y 2
+y 3
 end
 arch woodfloor2
 x 31
@@ -4330,7 +4334,7 @@ y 3
 end
 arch dungeon_magic
 x 31
-y 3
+y 4
 end
 arch woodfloor2
 x 31
@@ -4338,7 +4342,7 @@ y 4
 end
 arch dungeon_magic
 x 31
-y 4
+y 5
 end
 arch woodfloor2
 x 31
@@ -4346,7 +4350,7 @@ y 5
 end
 arch dungeon_magic
 x 31
-y 5
+y 6
 end
 arch woodfloor2
 x 31
@@ -4354,7 +4358,7 @@ y 6
 end
 arch dungeon_magic
 x 31
-y 6
+y 7
 end
 arch woodfloor2
 x 31
@@ -4362,7 +4366,7 @@ y 7
 end
 arch dungeon_magic
 x 31
-y 7
+y 8
 end
 arch woodfloor2
 x 31
@@ -4370,7 +4374,7 @@ y 8
 end
 arch dungeon_magic
 x 31
-y 8
+y 9
 end
 arch woodfloor2
 x 31
@@ -4389,7 +4393,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 31
-y 9
+y 10
 end
 arch woodfloor2
 x 31
@@ -4399,10 +4403,6 @@ arch flagstone_2_1_2
 x 31
 y 10
 end
-arch dungeon_magic
-x 31
-y 10
-end
 arch blocked
 x 31
 y 11
@@ -4428,6 +4428,9 @@ name dozen red roses
 x 31
 y 13
 end
+arch dungeon_magic
+x 32
+end
 arch woodfloor2
 x 32
 end
@@ -4436,6 +4439,7 @@ x 32
 end
 arch dungeon_magic
 x 32
+y 1
 end
 arch woodfloor2
 x 32
@@ -4447,7 +4451,7 @@ y 1
 end
 arch dungeon_magic
 x 32
-y 1
+y 2
 end
 arch woodfloor2
 x 32
@@ -4463,7 +4467,7 @@ can_roll 0
 end
 arch dungeon_magic
 x 32
-y 2
+y 3
 end
 arch woodfloor2
 x 32
@@ -4471,7 +4475,7 @@ y 3
 end
 arch dungeon_magic
 x 32
-y 3
+y 4
 end
 arch woodfloor2
 x 32
@@ -4479,7 +4483,7 @@ y 4
 end
 arch dungeon_magic
 x 32
-y 4
+y 5
 end
 arch woodfloor2
 x 32
@@ -4496,7 +4500,7 @@ y 5
 end
 arch dungeon_magic
 x 32
-y 5
+y 6
 end
 arch magic_mouth
 name Manager
@@ -4536,7 +4540,7 @@ can_roll 0
 end
 arch dungeon_magic
 x 32
-y 6
+y 7
 end
 arch magic_mouth
 name Manager
@@ -4572,10 +4576,6 @@ arch chair_2.3
 x 32
 y 7
 end
-arch dungeon_magic
-x 32
-y 7
-end
 arch dun0
 name Manager
 face pl_dragon_g.151
@@ -4583,13 +4583,17 @@ x 32
 y 7
 blocksview 0
 end
+arch dungeon_magic
+x 32
+y 8
+end
 arch woodfloor2
 x 32
 y 8
 end
 arch dungeon_magic
 x 32
-y 8
+y 9
 end
 arch woodfloor2
 x 32
@@ -4607,7 +4611,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 32
-y 9
+y 10
 end
 arch woodfloor2
 x 32
@@ -4617,10 +4621,6 @@ arch flagstone_2_1_2
 x 32
 y 10
 end
-arch dungeon_magic
-x 32
-y 10
-end
 arch blocked
 x 32
 y 11
@@ -4645,6 +4645,9 @@ arch blocked
 x 32
 y 13
 end
+arch dungeon_magic
+x 33
+end
 arch woodfloor2
 x 33
 end
@@ -4653,6 +4656,7 @@ x 33
 end
 arch dungeon_magic
 x 33
+y 1
 end
 arch woodfloor2
 x 33
@@ -4665,7 +4669,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 33
-y 1
+y 2
 end
 arch woodfloor2
 x 33
@@ -4673,7 +4677,7 @@ y 2
 end
 arch dungeon_magic
 x 33
-y 2
+y 3
 end
 arch woodfloor2
 x 33
@@ -4681,7 +4685,7 @@ y 3
 end
 arch dungeon_magic
 x 33
-y 3
+y 4
 end
 arch woodfloor2
 x 33
@@ -4689,7 +4693,7 @@ y 4
 end
 arch dungeon_magic
 x 33
-y 4
+y 5
 end
 arch woodfloor2
 x 33
@@ -4697,7 +4701,7 @@ y 5
 end
 arch dungeon_magic
 x 33
-y 5
+y 6
 end
 arch woodfloor2
 x 33
@@ -4705,7 +4709,7 @@ y 6
 end
 arch dungeon_magic
 x 33
-y 6
+y 7
 end
 arch woodfloor2
 x 33
@@ -4713,7 +4717,7 @@ y 7
 end
 arch dungeon_magic
 x 33
-y 7
+y 8
 end
 arch woodfloor2
 x 33
@@ -4721,7 +4725,7 @@ y 8
 end
 arch dungeon_magic
 x 33
-y 8
+y 9
 end
 arch woodfloor2
 x 33
@@ -4739,7 +4743,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 33
-y 9
+y 10
 end
 arch woodfloor2
 x 33
@@ -4749,10 +4753,6 @@ arch flagstone_2_1_2
 x 33
 y 10
 end
-arch dungeon_magic
-x 33
-y 10
-end
 arch blocked
 x 33
 y 11
@@ -4777,6 +4777,9 @@ arch blocked
 x 33
 y 13
 end
+arch dungeon_magic
+x 34
+end
 arch woodfloor2
 x 34
 end
@@ -4785,6 +4788,7 @@ x 34
 end
 arch dungeon_magic
 x 34
+y 1
 end
 arch woodfloor2
 x 34
@@ -4797,7 +4801,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 34
-y 1
+y 2
 end
 arch woodfloor2
 x 34
@@ -4805,7 +4809,7 @@ y 2
 end
 arch dungeon_magic
 x 34
-y 2
+y 3
 end
 arch woodfloor2
 x 34
@@ -4817,7 +4821,7 @@ y 3
 end
 arch dungeon_magic
 x 34
-y 3
+y 4
 end
 arch woodfloor2
 x 34
@@ -4829,7 +4833,7 @@ y 4
 end
 arch dungeon_magic
 x 34
-y 4
+y 5
 end
 arch woodfloor2
 x 34
@@ -4842,7 +4846,7 @@ no_pick 1
 end
 arch dungeon_magic
 x 34
-y 5
+y 6
 end
 arch woodfloor2
 x 34
@@ -4854,7 +4858,7 @@ y 6
 end
 arch dungeon_magic
 x 34
-y 6
+y 7
 end
 arch woodfloor2
 x 34
@@ -4866,7 +4870,7 @@ y 7
 end
 arch dungeon_magic
 x 34
-y 7
+y 8
 end
 arch woodfloor2
 x 34
@@ -4874,7 +4878,7 @@ y 8
 end
 arch dungeon_magic
 x 34
-y 8
+y 9
 end
 arch woodfloor2
 x 34
@@ -4886,7 +4890,7 @@ y 9
 end
 arch dungeon_magic
 x 34
-y 9
+y 10
 end
 arch woodfloor2
 x 34
@@ -4896,10 +4900,6 @@ arch flagstone_2_1_2
 x 34
 y 10
 end
-arch dungeon_magic
-x 34
-y 10
-end
 arch blocked
 x 34
 y 11
@@ -4924,6 +4924,9 @@ arch blocked
 x 34
 y 13
 end
+arch dungeon_magic
+x 35
+end
 arch woodfloor2
 x 35
 end
@@ -4932,6 +4935,7 @@ x 35
 end
 arch dungeon_magic
 x 35
+y 1
 end
 arch woodfloor2
 x 35
@@ -4943,7 +4947,7 @@ y 1
 end
 arch dungeon_magic
 x 35
-y 1
+y 2
 end
 arch woodfloor2
 x 35
@@ -4955,7 +4959,7 @@ y 2
 end
 arch dungeon_magic
 x 35
-y 2
+y 3
 end
 arch woodfloor2
 x 35
@@ -4967,7 +4971,7 @@ y 3
 end
 arch dungeon_magic
 x 35
-y 3
+y 4
 end
 arch woodfloor2
 x 35
@@ -4979,7 +4983,7 @@ y 4
 end
 arch dungeon_magic
 x 35
-y 4
+y 5
 end
 arch woodfloor2
 x 35
@@ -4991,7 +4995,7 @@ y 5
 end
 arch dungeon_magic
 x 35
-y 5
+y 6
 end
 arch woodfloor2
 x 35
@@ -5003,7 +5007,7 @@ y 6
 end
 arch dungeon_magic
 x 35
-y 6
+y 7
 end
 arch woodfloor2
 x 35
@@ -5015,7 +5019,7 @@ y 7
 end
 arch dungeon_magic
 x 35
-y 7
+y 8
 end
 arch woodfloor2
 x 35
@@ -5027,7 +5031,7 @@ y 8
 end
 arch dungeon_magic
 x 35
-y 8
+y 9
 end
 arch woodfloor2
 x 35
@@ -5039,7 +5043,7 @@ y 9
 end
 arch dungeon_magic
 x 35
-y 9
+y 10
 end
 arch woodfloor2
 x 35
@@ -5049,10 +5053,6 @@ arch flagstone_2_2_4
 x 35
 y 10
 end
-arch dungeon_magic
-x 35
-y 10
-end
 arch blocked
 x 35
 y 11
diff --git a/brest/pshops/pshopsinc2 b/brest/pshops/pshopsinc2
index 69e9da986..efb282f0b 100644
--- a/brest/pshops/pshopsinc2
+++ b/brest/pshops/pshopsinc2
@@ -9,11 +9,14 @@ Creator: majorwoo josh@woosworld.net
 Date:    10/17/2004
 endmsg
 end
+arch dungeon_magic
+end
 arch woodfloor
 end
 arch flagstone_2_2_2
 end
 arch dungeon_magic
+y 1
 end
 arch woodfloor
 y 1
@@ -22,7 +25,7 @@ arch flagstone_2_1_1
 y 1
 end
 arch dungeon_magic
-y 1
+y 2
 end
 arch woodfloor
 y 2
@@ -31,7 +34,7 @@ arch flagstone_2_1_1
 y 2
 end
 arch dungeon_magic
-y 2
+y 3
 end
 arch woodfloor
 y 3
@@ -40,7 +43,7 @@ arch flagstone_2_1_1
 y 3
 end
 arch dungeon_magic
-y 3
+y 4
 end
 arch woodfloor
 y 4
@@ -49,7 +52,7 @@ arch flagstone_2_1_1
 y 4
 end
 arch dungeon_magic
-y 4
+y 5
 end
 arch woodfloor
 y 5
@@ -58,7 +61,7 @@ arch flagstone_2_1_1
 y 5
 end
 arch dungeon_magic
-y 5
+y 6
 end
 arch woodfloor
 y 6
@@ -67,7 +70,7 @@ arch flagstone_2_1_1
 y 6
 end
 arch dungeon_magic
-y 6
+y 7
 end
 arch woodfloor
 y 7
@@ -76,7 +79,7 @@ arch flagstone_2_1_1
 y 7
 end
 arch dungeon_magic
-y 7
+y 8
 end
 arch woodfloor
 y 8
@@ -85,7 +88,7 @@ arch flagstone_2_1_1
 y 8
 end
 arch dungeon_magic
-y 8
+y 9
 end
 arch woodfloor
 y 9
@@ -94,7 +97,7 @@ arch flagstone_2_1_1
 y 9
 end
 arch dungeon_magic
-y 9
+y 10
 end
 arch woodfloor
 y 10
@@ -102,9 +105,6 @@ end
 arch flagstone_2_2_1
 y 10
 end
-arch dungeon_magic
-y 10
-end
 arch blocked
 y 11
 end
@@ -114,6 +114,9 @@ end
 arch blocked
 y 13
 end
+arch dungeon_magic
+x 1
+end
 arch woodfloor
 x 1
 end
@@ -122,6 +125,7 @@ x 1
 end
 arch dungeon_magic
 x 1
+y 1
 end
 arch woodfloor
 x 1
@@ -133,7 +137,7 @@ y 1
 end
 arch dungeon_magic
 x 1
-y 1
+y 2
 end
 arch woodfloor
 x 1
@@ -141,7 +145,7 @@ y 2
 end
 arch dungeon_magic
 x 1
-y 2
+y 3
 end
 arch woodfloor
 x 1
@@ -149,7 +153,7 @@ y 3
 end
 arch dungeon_magic
 x 1
-y 3
+y 4
 end
 arch woodfloor
 x 1
@@ -157,7 +161,7 @@ y 4
 end
 arch dungeon_magic
 x 1
-y 4
+y 5
 end
 arch woodfloor
 x 1
@@ -173,7 +177,7 @@ y 5
 end
 arch dungeon_magic
 x 1
-y 5
+y 6
 end
 arch woodfloor
 x 1
@@ -181,7 +185,7 @@ y 6
 end
 arch dungeon_magic
 x 1
-y 6
+y 7
 end
 arch woodfloor
 x 1
@@ -189,7 +193,7 @@ y 7
 end
 arch dungeon_magic
 x 1
-y 7
+y 8
 end
 arch woodfloor
 x 1
@@ -197,7 +201,7 @@ y 8
 end
 arch dungeon_magic
 x 1
-y 8
+y 9
 end
 arch woodfloor
 x 1
@@ -209,7 +213,7 @@ y 9
 end
 arch dungeon_magic
 x 1
-y 9
+y 10
 end
 arch woodfloor
 x 1
@@ -219,10 +223,6 @@ arch flagstone_2_1_2
 x 1
 y 10
 end
-arch dungeon_magic
-x 1
-y 10
-end
 arch blocked
 x 1
 y 11
@@ -235,6 +235,9 @@ arch blocked
 x 1
 y 13
 end
+arch dungeon_magic
+x 2
+end
 arch woodfloor
 x 2
 end
@@ -243,6 +246,7 @@ x 2
 end
 arch dungeon_magic
 x 2
+y 1
 end
 arch woodfloor
 x 2
@@ -250,7 +254,7 @@ y 1
 end
 arch dungeon_magic
 x 2
-y 1
+y 2
 end
 arch woodfloor
 x 2
@@ -258,7 +262,7 @@ y 2
 end
 arch dungeon_magic
 x 2
-y 2
+y 3
 end
 arch woodfloor
 x 2
@@ -266,7 +270,7 @@ y 3
 end
 arch dungeon_magic
 x 2
-y 3
+y 4
 end
 arch woodfloor
 x 2
@@ -274,7 +278,7 @@ y 4
 end
 arch dungeon_magic
 x 2
-y 4
+y 5
 end
 arch woodfloor
 x 2
@@ -282,7 +286,7 @@ y 5
 end
 arch dungeon_magic
 x 2
-y 5
+y 6
 end
 arch woodfloor
 x 2
@@ -290,7 +294,7 @@ y 6
 end
 arch dungeon_magic
 x 2
-y 6
+y 7
 end
 arch woodfloor
 x 2
@@ -298,7 +302,7 @@ y 7
 end
 arch dungeon_magic
 x 2
-y 7
+y 8
 end
 arch woodfloor
 x 2
@@ -306,7 +310,7 @@ y 8
 end
 arch dungeon_magic
 x 2
-y 8
+y 9
 end
 arch woodfloor
 x 2
@@ -314,7 +318,7 @@ y 9
 end
 arch dungeon_magic
 x 2
-y 9
+y 10
 end
 arch woodfloor
 x 2
@@ -324,10 +328,6 @@ arch flagstone_2_1_2
 x 2
 y 10
 end
-arch dungeon_magic
-x 2
-y 10
-end
 arch blocked
 x 2
 y 11
@@ -340,6 +340,9 @@ arch blocked
 x 2
 y 13
 end
+arch dungeon_magic
+x 3
+end
 arch woodfloor
 x 3
 end
@@ -348,6 +351,7 @@ x 3
 end
 arch dungeon_magic
 x 3
+y 1
 end
 arch woodfloor
 x 3
@@ -360,7 +364,7 @@ y 1
 end
 arch dungeon_magic
 x 3
-y 1
+y 2
 end
 arch woodfloor
 x 3
@@ -368,7 +372,7 @@ y 2
 end
 arch dungeon_magic
 x 3
-y 2
+y 3
 end
 arch woodfloor
 x 3
@@ -376,7 +380,7 @@ y 3
 end
 arch dungeon_magic
 x 3
-y 3
+y 4
 end
 arch woodfloor
 x 3
@@ -399,7 +403,7 @@ y 4
 end
 arch dungeon_magic
 x 3
-y 4
+y 5
 end
 arch check_floor
 slaying pshop1
@@ -596,7 +600,7 @@ y 5
 end
 arch dungeon_magic
 x 3
-y 5
+y 6
 end
 arch woodfloor
 x 3
@@ -609,7 +613,7 @@ y 6
 end
 arch dungeon_magic
 x 3
-y 6
+y 7
 end
 arch woodfloor
 x 3
@@ -617,7 +621,7 @@ y 7
 end
 arch dungeon_magic
 x 3
-y 7
+y 8
 end
 arch altar_trigger
 name entrance_altar
@@ -652,10 +656,6 @@ arch woodfloor
 x 3
 y 8
 end
-arch dungeon_magic
-x 3
-y 8
-end
 arch teleporter
 hp 5
 sp 6
@@ -665,6 +665,10 @@ speed 0.0
 invisible 1
 connected 2
 end
+arch dungeon_magic
+x 3
+y 9
+end
 arch woodfloor
 x 3
 y 9
@@ -695,7 +699,7 @@ stand_still 1
 end
 arch dungeon_magic
 x 3
-y 9
+y 10
 end
 arch woodfloor
 x 3
@@ -705,10 +709,6 @@ arch flagstone_2_1_2
 x 3
 y 10
 end
-arch dungeon_magic
-x 3
-y 10
-end
 arch blocked
 x 3
 y 11
@@ -721,6 +721,9 @@ arch blocked
 x 3
 y 13
 end
+arch dungeon_magic
+x 4
+end
 arch woodfloor
 x 4
 end
@@ -729,6 +732,7 @@ x 4
 end
 arch dungeon_magic
 x 4
+y 1
 end
 arch woodfloor
 x 4
@@ -740,7 +744,7 @@ y 1
 end
 arch dungeon_magic
 x 4
-y 1
+y 2
 end
 arch woodfloor
 x 4
@@ -752,7 +756,7 @@ y 2
 end
 arch dungeon_magic
 x 4
-y 2
+y 3
 end
 arch woodfloor
 x 4
@@ -764,7 +768,7 @@ y 3
 end
 arch dungeon_magic
 x 4
-y 3
+y 4
 end
 arch woodfloor
 x 4
@@ -776,7 +780,7 @@ y 4
 end
 arch dungeon_magic
 x 4
-y 4
+y 5
 end
 arch pedestal
 x 4
@@ -794,7 +798,7 @@ connected 1
 end
 arch dungeon_magic
 x 4
-y 5
+y 6
 end
 arch woodfloor
 x 4
@@ -806,7 +810,7 @@ y 6
 end
 arch dungeon_magic
 x 4
-y 6
+y 7
 end
 arch woodfloor
 x 4
@@ -818,7 +822,7 @@ y 7
 end
 arch dungeon_magic
 x 4
-y 7
+y 8
 end
 arch woodfloor
 x 4
@@ -830,7 +834,7 @@ y 8
 end
 arch dungeon_magic
 x 4
-y 8
+y 9
 end
 arch woodfloor
 x 4
@@ -842,7 +846,7 @@ y 9
 end
 arch dungeon_magic
 x 4
-y 9
+y 10
 end
 arch woodfloor
 x 4
@@ -852,10 +856,6 @@ arch flagstone_3_1
 x 4
 y 10
 end
-arch dungeon_magic
-x 4
-y 10
-end
 arch blocked
 x 4
 y 11
@@ -2445,6 +2445,10 @@ arch woodfloor
 x 22
 y 7
 end
+arch dungeon_magic
+x 22
+y 8
+end
 arch magic_mouth
 name Elite Dragon Guard
 msg
@@ -2460,10 +2464,6 @@ arch woodfloor
 x 22
 y 8
 end
-arch dungeon_magic
-x 22
-y 8
-end
 arch dun0
 name Elite Dragon Guard
 face pl_dragon_bl.151
@@ -3390,6 +3390,9 @@ end
 arch flagstone_2_1_2
 x 32
 end
+arch swall_1_1_half
+x 32
+end
 arch woodfloor
 x 32
 y 1
@@ -3466,6 +3469,10 @@ arch woodfloor
 x 32
 y 10
 end
+arch swall_1_2_half
+x 32
+y 10
+end
 arch flagstone_2_1_2
 x 32
 y 10
diff --git a/brest/shops/a_small_shop b/brest/shops/a_small_shop
index 6c2815514..e83075364 100644
--- a/brest/shops/a_small_shop
+++ b/brest/shops/a_small_shop
@@ -614,8 +614,8 @@ arch barrel
 x 4
 y 6
 material 0
-no_pick 1
 move_block 0
+no_pick 1
 end
 arch woodfloor2
 x 4
@@ -916,8 +916,8 @@ arch barrel
 x 6
 y 8
 material 0
-no_pick 1
 move_block 0
+no_pick 1
 end
 arch woodfloor2
 x 6
@@ -1456,8 +1456,8 @@ arch barrel
 x 10
 y 6
 material 0
-no_pick 1
 move_block 0
+no_pick 1
 end
 arch woodfloor2
 x 10
diff --git a/brest/shops/buildshop b/brest/shops/buildshop
index c40652265..5bc5a0048 100644
--- a/brest/shops/buildshop
+++ b/brest/shops/buildshop
@@ -2,7 +2,7 @@ arch map
 name Acme Inc.
 region brest
 shopitems building material:95;item builder:95;*:-100
-shopgreed 1.0
+shopgreed 1.00000
 shopmin 500
 shopmax 20000
 shoprace human
diff --git a/brest/shops/buildshop2 b/brest/shops/buildshop2
index 6cb044319..ab0e904ab 100644
--- a/brest/shops/buildshop2
+++ b/brest/shops/buildshop2
@@ -2,7 +2,7 @@ arch map
 name Acme Inc.
 region brest
 shopitems building material:95;item builder:95;*:-100
-shopgreed 1.0
+shopgreed 1.00000
 shopmin 500
 shopmax 20000
 shoprace human
diff --git a/brest/sow/sow b/brest/sow/sow
index c8d9a5415..1d6f023c4 100755
--- a/brest/sow/sow
+++ b/brest/sow/sow
@@ -2656,10 +2656,10 @@ maxhp 100
 x 12
 y 11
 randomitems standard
+pick_up 0
 no_pick 1
 monster 0
 friendly 0
-pick_up 0
 stand_still 1
 end
 arch sleep_floor
diff --git a/brest/sow/sow.1 b/brest/sow/sow.1
index d8219a4e4..e2e6597db 100755
--- a/brest/sow/sow.1
+++ b/brest/sow/sow.1
@@ -6108,11 +6108,11 @@ resist_slow 50
 resist_paralyze 100
 resist_deplete 100
 resist_death 50
+pick_up 0
 will_apply 0
 generator 0
 undead 0
 run_away 30
-pick_up 0
 can_use_skill 1
 use_content_on_gen 0
 con 1
diff --git a/brest/zorn/castle.basement0 b/brest/zorn/castle.basement0
index 989cb1e1a..2b90311ae 100644
--- a/brest/zorn/castle.basement0
+++ b/brest/zorn/castle.basement0
@@ -1925,6 +1925,10 @@ name dirt floor
 x 6
 y 10
 end
+arch dungeon_magic
+x 6
+y 11
+end
 arch earth
 name dirt floor
 x 6
@@ -1950,10 +1954,6 @@ arch trap_rocks
 x 6
 y 11
 end
-arch dungeon_magic
-x 6
-y 11
-end
 arch earth
 name dirt floor
 x 6
@@ -15976,6 +15976,10 @@ arch flagstone
 x 44
 y 10
 end
+arch giantrat
+x 44
+y 10
+end
 arch flagstone
 x 44
 y 11
@@ -21403,7 +21407,3 @@ arch blocked
 x 58
 y 58
 end
-arch giantrat
-x 44
-y 10
-end
diff --git a/brest/zorn/castle.mainfloor b/brest/zorn/castle.mainfloor
index ce2860958..fb8739e05 100644
--- a/brest/zorn/castle.mainfloor
+++ b/brest/zorn/castle.mainfloor
@@ -3190,8 +3190,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3238,8 +3238,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3302,8 +3302,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3350,8 +3350,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3414,8 +3414,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3462,8 +3462,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3526,8 +3526,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3620,8 +3620,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3740,8 +3740,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -3788,8 +3788,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -4193,8 +4193,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -4251,10 +4251,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -4320,10 +4320,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -4395,8 +4395,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -5441,8 +5441,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -5738,8 +5738,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -5810,8 +5810,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -5910,8 +5910,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -6203,8 +6203,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -6275,8 +6275,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -7512,8 +7512,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -7652,8 +7652,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -7724,8 +7724,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -7824,8 +7824,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -7993,8 +7993,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -8133,8 +8133,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -8205,8 +8205,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -8353,8 +8353,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9473,8 +9473,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9521,8 +9521,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9585,8 +9585,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9633,8 +9633,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9697,8 +9697,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9745,8 +9745,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9809,8 +9809,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -9891,8 +9891,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10011,8 +10011,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10059,8 +10059,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10224,8 +10224,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10296,8 +10296,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10733,8 +10733,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10805,8 +10805,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10909,8 +10909,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -10963,8 +10963,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11011,8 +11011,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11077,8 +11077,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11131,8 +11131,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11179,8 +11179,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11393,8 +11393,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11445,8 +11445,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11495,10 +11495,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11564,10 +11564,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11631,8 +11631,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -11683,8 +11683,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -12517,8 +12517,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -12739,8 +12739,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -12787,8 +12787,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -12835,8 +12835,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -13016,8 +13016,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -13259,10 +13259,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -13741,10 +13741,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -14224,10 +14224,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -14682,8 +14682,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -14730,8 +14730,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -14778,8 +14778,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -14959,8 +14959,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -15365,8 +15365,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -15907,8 +15907,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -15959,8 +15959,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16009,10 +16009,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16078,10 +16078,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16145,8 +16145,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16197,8 +16197,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16514,8 +16514,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16586,8 +16586,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16690,8 +16690,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16744,8 +16744,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16792,8 +16792,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16858,8 +16858,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16912,8 +16912,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -16960,8 +16960,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -17174,8 +17174,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -17246,8 +17246,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -17790,8 +17790,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -17872,8 +17872,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -18016,8 +18016,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -18649,8 +18649,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19113,8 +19113,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19354,8 +19354,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19426,8 +19426,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19518,8 +19518,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19687,8 +19687,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19833,8 +19833,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -19905,8 +19905,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -20013,8 +20013,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -20616,8 +20616,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -21307,8 +21307,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -21379,8 +21379,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -21608,8 +21608,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -21754,8 +21754,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -21826,8 +21826,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -21918,8 +21918,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -22087,8 +22087,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -22404,8 +22404,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -22573,8 +22573,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -22625,8 +22625,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -23161,8 +23161,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -23398,8 +23398,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -23456,10 +23456,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -23525,10 +23525,10 @@ resist_paralyze 30
 resist_fear 100
 resist_blind 30
 carrying 28000
+pick_up 24
 will_apply 4
 unaggressive 0
 run_away 5
-pick_up 24
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -23600,8 +23600,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -23857,8 +23857,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -24009,8 +24009,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -24103,8 +24103,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
@@ -24247,8 +24247,8 @@ resist_paralyze 25
 resist_fear 100
 resist_blind 25
 randomitems guard_h
-run_away 5
 pick_up 24
+run_away 5
 can_use_bow 1
 can_use_armour 1
 can_use_weapon 1
diff --git a/brest/zorn/castle.upper.floor.one b/brest/zorn/castle.upper.floor.one
index 5ce3a1ed2..3c2cc3e92 100644
--- a/brest/zorn/castle.upper.floor.one
+++ b/brest/zorn/castle.upper.floor.one
@@ -698,17 +698,13 @@ arch brush
 x 3
 y 2
 end
-arch brush
-x 3
-y 3
-end
 arch dungeon_magic
 x 3
 y 3
 end
 arch brush
 x 3
-y 4
+y 3
 end
 arch dungeon_magic
 x 3
@@ -716,7 +712,7 @@ y 4
 end
 arch brush
 x 3
-y 5
+y 4
 end
 arch dungeon_magic
 x 3
@@ -724,7 +720,7 @@ y 5
 end
 arch brush
 x 3
-y 6
+y 5
 end
 arch dungeon_magic
 x 3
@@ -732,6 +728,14 @@ y 6
 end
 arch brush
 x 3
+y 6
+end
+arch dungeon_magic
+x 3
+y 7
+end
+arch brush
+x 3
 y 7
 end
 arch lamppost
@@ -743,7 +747,7 @@ move_block all
 end
 arch dungeon_magic
 x 3
-y 7
+y 8
 end
 arch brush
 x 3
@@ -751,7 +755,7 @@ y 8
 end
 arch dungeon_magic
 x 3
-y 8
+y 9
 end
 arch brush
 x 3
@@ -759,7 +763,7 @@ y 9
 end
 arch dungeon_magic
 x 3
-y 9
+y 10
 end
 arch brush
 x 3
@@ -767,7 +771,7 @@ y 10
 end
 arch dungeon_magic
 x 3
-y 10
+y 11
 end
 arch brush
 x 3
@@ -775,7 +779,7 @@ y 11
 end
 arch dungeon_magic
 x 3
-y 11
+y 12
 end
 arch brush
 x 3
@@ -783,7 +787,7 @@ y 12
 end
 arch dungeon_magic
 x 3
-y 12
+y 13
 end
 arch brush
 x 3
@@ -791,7 +795,7 @@ y 13
 end
 arch dungeon_magic
 x 3
-y 13
+y 14
 end
 arch brush
 x 3
@@ -799,7 +803,7 @@ y 14
 end
 arch dungeon_magic
 x 3
-y 14
+y 15
 end
 arch brush
 x 3
@@ -807,7 +811,7 @@ y 15
 end
 arch dungeon_magic
 x 3
-y 15
+y 16
 end
 arch brush
 x 3
@@ -815,7 +819,7 @@ y 16
 end
 arch dungeon_magic
 x 3
-y 16
+y 17
 end
 arch brush
 x 3
@@ -823,7 +827,7 @@ y 17
 end
 arch dungeon_magic
 x 3
-y 17
+y 18
 end
 arch brush
 x 3
@@ -831,7 +835,7 @@ y 18
 end
 arch dungeon_magic
 x 3
-y 18
+y 19
 end
 arch brush
 x 3
@@ -839,7 +843,7 @@ y 19
 end
 arch dungeon_magic
 x 3
-y 19
+y 20
 end
 arch brush
 x 3
@@ -847,7 +851,7 @@ y 20
 end
 arch dungeon_magic
 x 3
-y 20
+y 21
 end
 arch brush
 x 3
@@ -855,7 +859,7 @@ y 21
 end
 arch dungeon_magic
 x 3
-y 21
+y 22
 end
 arch brush
 x 3
@@ -863,7 +867,7 @@ y 22
 end
 arch dungeon_magic
 x 3
-y 22
+y 23
 end
 arch brush
 x 3
@@ -871,7 +875,7 @@ y 23
 end
 arch dungeon_magic
 x 3
-y 23
+y 24
 end
 arch brush
 x 3
@@ -879,7 +883,7 @@ y 24
 end
 arch dungeon_magic
 x 3
-y 24
+y 25
 end
 arch brush
 x 3
@@ -887,7 +891,7 @@ y 25
 end
 arch dungeon_magic
 x 3
-y 25
+y 26
 end
 arch brush
 x 3
@@ -895,7 +899,7 @@ y 26
 end
 arch dungeon_magic
 x 3
-y 26
+y 27
 end
 arch brush
 x 3
@@ -903,7 +907,7 @@ y 27
 end
 arch dungeon_magic
 x 3
-y 27
+y 28
 end
 arch brush
 x 3
@@ -911,7 +915,7 @@ y 28
 end
 arch dungeon_magic
 x 3
-y 28
+y 29
 end
 arch brush
 x 3
@@ -919,7 +923,7 @@ y 29
 end
 arch dungeon_magic
 x 3
-y 29
+y 30
 end
 arch brush
 x 3
@@ -927,7 +931,7 @@ y 30
 end
 arch dungeon_magic
 x 3
-y 30
+y 31
 end
 arch brush
 x 3
@@ -935,7 +939,7 @@ y 31
 end
 arch dungeon_magic
 x 3
-y 31
+y 32
 end
 arch brush
 x 3
@@ -943,7 +947,7 @@ y 32
 end
 arch dungeon_magic
 x 3
-y 32
+y 33
 end
 arch brush
 x 3
@@ -951,7 +955,7 @@ y 33
 end
 arch dungeon_magic
 x 3
-y 33
+y 34
 end
 arch brush
 x 3
@@ -959,7 +963,7 @@ y 34
 end
 arch dungeon_magic
 x 3
-y 34
+y 35
 end
 arch brush
 x 3
@@ -967,7 +971,7 @@ y 35
 end
 arch dungeon_magic
 x 3
-y 35
+y 36
 end
 arch brush
 x 3
@@ -975,7 +979,7 @@ y 36
 end
 arch dungeon_magic
 x 3
-y 36
+y 37
 end
 arch brush
 x 3
@@ -983,7 +987,7 @@ y 37
 end
 arch dungeon_magic
 x 3
-y 37
+y 38
 end
 arch brush
 x 3
@@ -991,7 +995,7 @@ y 38
 end
 arch dungeon_magic
 x 3
-y 38
+y 39
 end
 arch brush
 x 3
@@ -999,7 +1003,7 @@ y 39
 end
 arch dungeon_magic
 x 3
-y 39
+y 40
 end
 arch brush
 x 3
@@ -1007,7 +1011,7 @@ y 40
 end
 arch dungeon_magic
 x 3
-y 40
+y 41
 end
 arch brush
 x 3
@@ -1015,7 +1019,7 @@ y 41
 end
 arch dungeon_magic
 x 3
-y 41
+y 42
 end
 arch brush
 x 3
@@ -1023,7 +1027,7 @@ y 42
 end
 arch dungeon_magic
 x 3
-y 42
+y 43
 end
 arch brush
 x 3
@@ -1031,7 +1035,7 @@ y 43
 end
 arch dungeon_magic
 x 3
-y 43
+y 44
 end
 arch brush
 x 3
@@ -1039,7 +1043,7 @@ y 44
 end
 arch dungeon_magic
 x 3
-y 44
+y 45
 end
 arch brush
 x 3
@@ -1047,7 +1051,7 @@ y 45
 end
 arch dungeon_magic
 x 3
-y 45
+y 46
 end
 arch brush
 x 3
@@ -1055,7 +1059,7 @@ y 46
 end
 arch dungeon_magic
 x 3
-y 46
+y 47
 end
 arch brush
 x 3
@@ -1063,7 +1067,7 @@ y 47
 end
 arch dungeon_magic
 x 3
-y 47
+y 48
 end
 arch brush
 x 3
@@ -1071,7 +1075,7 @@ y 48
 end
 arch dungeon_magic
 x 3
-y 48
+y 49
 end
 arch brush
 x 3
@@ -1079,7 +1083,7 @@ y 49
 end
 arch dungeon_magic
 x 3
-y 49
+y 50
 end
 arch brush
 x 3
@@ -1087,7 +1091,7 @@ y 50
 end
 arch dungeon_magic
 x 3
-y 50
+y 51
 end
 arch brush
 x 3
@@ -1095,7 +1099,7 @@ y 51
 end
 arch dungeon_magic
 x 3
-y 51
+y 52
 end
 arch brush
 x 3
@@ -1103,7 +1107,7 @@ y 52
 end
 arch dungeon_magic
 x 3
-y 52
+y 53
 end
 arch brush
 x 3
@@ -1111,7 +1115,7 @@ y 53
 end
 arch dungeon_magic
 x 3
-y 53
+y 54
 end
 arch brush
 x 3
@@ -1119,13 +1123,9 @@ y 54
 end
 arch dungeon_magic
 x 3
-y 54
-end
-arch brush
-x 3
 y 55
 end
-arch dungeon_magic
+arch brush
 x 3
 y 55
 end
@@ -1162,11 +1162,11 @@ arch brush
 x 4
 y 2
 end
-arch brush
+arch dungeon_magic
 x 4
 y 3
 end
-arch dungeon_magic
+arch brush
 x 4
 y 3
 end
@@ -1425,11 +1425,11 @@ name moat
 x 4
 y 54
 end
-arch brush
+arch dungeon_magic
 x 4
 y 55
 end
-arch dungeon_magic
+arch brush
 x 4
 y 55
 end
@@ -1466,11 +1466,11 @@ arch brush
 x 5
 y 2
 end
-arch brush
+arch dungeon_magic
 x 5
 y 3
 end
-arch dungeon_magic
+arch brush
 x 5
 y 3
 end
@@ -1729,11 +1729,11 @@ name moat
 x 5
 y 54
 end
-arch brush
+arch dungeon_magic
 x 5
 y 55
 end
-arch dungeon_magic
+arch brush
 x 5
 y 55
 end
@@ -1770,11 +1770,11 @@ arch brush
 x 6
 y 2
 end
-arch brush
+arch dungeon_magic
 x 6
 y 3
 end
-arch dungeon_magic
+arch brush
 x 6
 y 3
 end
@@ -2033,11 +2033,11 @@ name moat
 x 6
 y 54
 end
-arch brush
+arch dungeon_magic
 x 6
 y 55
 end
-arch dungeon_magic
+arch brush
 x 6
 y 55
 end
@@ -2074,11 +2074,11 @@ arch brush
 x 7
 y 2
 end
-arch brush
+arch dungeon_magic
 x 7
 y 3
 end
-arch dungeon_magic
+arch brush
 x 7
 y 3
 end
@@ -2467,11 +2467,11 @@ name moat
 x 7
 y 54
 end
-arch brush
+arch dungeon_magic
 x 7
 y 55
 end
-arch dungeon_magic
+arch brush
 x 7
 y 55
 end
@@ -2508,11 +2508,11 @@ arch brush
 x 8
 y 2
 end
-arch brush
+arch dungeon_magic
 x 8
 y 3
 end
-arch dungeon_magic
+arch brush
 x 8
 y 3
 end
@@ -2580,6 +2580,10 @@ arch cwall_1_2
 x 8
 y 12
 end
+arch dungeon_magic
+x 8
+y 13
+end
 arch cobblestones2
 x 8
 y 13
@@ -2590,7 +2594,7 @@ y 13
 end
 arch dungeon_magic
 x 8
-y 13
+y 14
 end
 arch cobblestones2
 x 8
@@ -2600,10 +2604,6 @@ arch swall_1_2
 x 8
 y 14
 end
-arch dungeon_magic
-x 8
-y 14
-end
 arch cobblestones2
 x 8
 y 15
@@ -2668,6 +2668,10 @@ arch cwall_1_2
 x 8
 y 22
 end
+arch dungeon_magic
+x 8
+y 23
+end
 arch cobblestones2
 x 8
 y 23
@@ -2678,7 +2682,7 @@ y 23
 end
 arch dungeon_magic
 x 8
-y 23
+y 24
 end
 arch cobblestones2
 x 8
@@ -2688,10 +2692,6 @@ arch swall_1_2
 x 8
 y 24
 end
-arch dungeon_magic
-x 8
-y 24
-end
 arch cobblestones2
 x 8
 y 25
@@ -2716,6 +2716,10 @@ arch cwall_1_2
 x 8
 y 27
 end
+arch dungeon_magic
+x 8
+y 28
+end
 arch cobblestones2
 x 8
 y 28
@@ -2726,7 +2730,7 @@ y 28
 end
 arch dungeon_magic
 x 8
-y 28
+y 29
 end
 arch cobblestones2
 x 8
@@ -2736,10 +2740,6 @@ arch swall_1_2
 x 8
 y 29
 end
-arch dungeon_magic
-x 8
-y 29
-end
 arch cobblestones2
 x 8
 y 30
@@ -2764,6 +2764,10 @@ arch cwall_1_2
 x 8
 y 32
 end
+arch dungeon_magic
+x 8
+y 33
+end
 arch cobblestones2
 x 8
 y 33
@@ -2774,7 +2778,7 @@ y 33
 end
 arch dungeon_magic
 x 8
-y 33
+y 34
 end
 arch cobblestones2
 x 8
@@ -2784,10 +2788,6 @@ arch swall_1_2
 x 8
 y 34
 end
-arch dungeon_magic
-x 8
-y 34
-end
 arch cobblestones2
 x 8
 y 35
@@ -2844,6 +2844,10 @@ arch cwall_1_2
 x 8
 y 41
 end
+arch dungeon_magic
+x 8
+y 42
+end
 arch cobblestones2
 x 8
 y 42
@@ -2854,7 +2858,7 @@ y 42
 end
 arch dungeon_magic
 x 8
-y 42
+y 43
 end
 arch cobblestones2
 x 8
@@ -2864,10 +2868,6 @@ arch swall_1_2
 x 8
 y 43
 end
-arch dungeon_magic
-x 8
-y 43
-end
 arch cobblestones2
 x 8
 y 44
@@ -2948,11 +2948,11 @@ name moat
 x 8
 y 54
 end
-arch brush
+arch dungeon_magic
 x 8
 y 55
 end
-arch dungeon_magic
+arch brush
 x 8
 y 55
 end
@@ -2989,11 +2989,11 @@ arch brush
 x 9
 y 2
 end
-arch brush
+arch dungeon_magic
 x 9
 y 3
 end
-arch dungeon_magic
+arch brush
 x 9
 y 3
 end
@@ -3287,11 +3287,11 @@ name moat
 x 9
 y 54
 end
-arch brush
+arch dungeon_magic
 x 9
 y 55
 end
-arch dungeon_magic
+arch brush
 x 9
 y 55
 end
@@ -3328,11 +3328,11 @@ arch brush
 x 10
 y 2
 end
-arch brush
+arch dungeon_magic
 x 10
 y 3
 end
-arch dungeon_magic
+arch brush
 x 10
 y 3
 end
@@ -3402,6 +3402,10 @@ arch dwall_2_2_1
 x 10
 y 12
 end
+arch dungeon_magic
+x 10
+y 13
+end
 arch cobblestones2
 x 10
 y 13
@@ -3412,7 +3416,7 @@ y 13
 end
 arch dungeon_magic
 x 10
-y 13
+y 14
 end
 arch cobblestones2
 x 10
@@ -3422,10 +3426,6 @@ arch swall_1_2
 x 10
 y 14
 end
-arch dungeon_magic
-x 10
-y 14
-end
 arch cobblestones2
 x 10
 y 15
@@ -3490,6 +3490,10 @@ arch dwall_1_2
 x 10
 y 22
 end
+arch dungeon_magic
+x 10
+y 23
+end
 arch cobblestones2
 x 10
 y 23
@@ -3500,7 +3504,7 @@ y 23
 end
 arch dungeon_magic
 x 10
-y 23
+y 24
 end
 arch cobblestones2
 x 10
@@ -3510,10 +3514,6 @@ arch swall_1_2
 x 10
 y 24
 end
-arch dungeon_magic
-x 10
-y 24
-end
 arch cobblestones2
 x 10
 y 25
@@ -3582,6 +3582,10 @@ arch dwall_1_2
 x 10
 y 32
 end
+arch dungeon_magic
+x 10
+y 33
+end
 arch cobblestones2
 x 10
 y 33
@@ -3592,7 +3596,7 @@ y 33
 end
 arch dungeon_magic
 x 10
-y 33
+y 34
 end
 arch cobblestones2
 x 10
@@ -3602,10 +3606,6 @@ arch swall_1_2
 x 10
 y 34
 end
-arch dungeon_magic
-x 10
-y 34
-end
 arch cobblestones2
 x 10
 y 35
@@ -3662,6 +3662,10 @@ arch dwall_1_2
 x 10
 y 41
 end
+arch dungeon_magic
+x 10
+y 42
+end
 arch cobblestones2
 x 10
 y 42
@@ -3672,7 +3676,7 @@ y 42
 end
 arch dungeon_magic
 x 10
-y 42
+y 43
 end
 arch cobblestones2
 x 10
@@ -3682,10 +3686,6 @@ arch swall_1_2
 x 10
 y 43
 end
-arch dungeon_magic
-x 10
-y 43
-end
 arch cobblestones2
 x 10
 y 44
@@ -3738,6 +3738,10 @@ arch cobblestones2
 x 10
 y 49
 end
+arch dungeon_magic
+x 10
+y 50
+end
 arch cobblestones2
 x 10
 y 50
@@ -3747,10 +3751,6 @@ face swall_AA.111
 x 10
 y 50
 end
-arch dungeon_magic
-x 10
-y 50
-end
 arch brush
 x 10
 y 51
@@ -3770,11 +3770,11 @@ name moat
 x 10
 y 54
 end
-arch brush
+arch dungeon_magic
 x 10
 y 55
 end
-arch dungeon_magic
+arch brush
 x 10
 y 55
 end
@@ -3811,11 +3811,11 @@ arch brush
 x 11
 y 2
 end
-arch brush
+arch dungeon_magic
 x 11
 y 3
 end
-arch dungeon_magic
+arch brush
 x 11
 y 3
 end
@@ -4305,11 +4305,11 @@ name moat
 x 11
 y 54
 end
-arch brush
+arch dungeon_magic
 x 11
 y 55
 end
-arch dungeon_magic
+arch brush
 x 11
 y 55
 end
@@ -4346,11 +4346,11 @@ arch brush
 x 12
 y 2
 end
-arch brush
+arch dungeon_magic
 x 12
 y 3
 end
-arch dungeon_magic
+arch brush
 x 12
 y 3
 end
@@ -4926,11 +4926,11 @@ name moat
 x 12
 y 54
 end
-arch brush
+arch dungeon_magic
 x 12
 y 55
 end
-arch dungeon_magic
+arch brush
 x 12
 y 55
 end
@@ -4967,11 +4967,11 @@ arch brush
 x 13
 y 2
 end
-arch brush
+arch dungeon_magic
 x 13
 y 3
 end
-arch dungeon_magic
+arch brush
 x 13
 y 3
 end
@@ -5538,11 +5538,11 @@ name moat
 x 13
 y 54
 end
-arch brush
+arch dungeon_magic
 x 13
 y 55
 end
-arch dungeon_magic
+arch brush
 x 13
 y 55
 end
@@ -5579,11 +5579,11 @@ arch brush
 x 14
 y 2
 end
-arch brush
+arch dungeon_magic
 x 14
 y 3
 end
-arch dungeon_magic
+arch brush
 x 14
 y 3
 end
@@ -5606,6 +5606,10 @@ arch brush
 x 14
 y 7
 end
+arch dungeon_magic
+x 14
+y 8
+end
 arch cobblestones2
 x 14
 y 8
@@ -5614,10 +5618,6 @@ arch swall_1_4
 x 14
 y 8
 end
-arch dungeon_magic
-x 14
-y 8
-end
 arch cobblestones2
 x 14
 y 9
@@ -5952,11 +5952,11 @@ name moat
 x 14
 y 54
 end
-arch brush
+arch dungeon_magic
 x 14
 y 55
 end
-arch dungeon_magic
+arch brush
 x 14
 y 55
 end
@@ -5993,11 +5993,11 @@ arch brush
 x 15
 y 2
 end
-arch brush
+arch dungeon_magic
 x 15
 y 3
 end
-arch dungeon_magic
+arch brush
 x 15
 y 3
 end
@@ -6020,6 +6020,10 @@ arch brush
 x 15
 y 7
 end
+arch dungeon_magic
+x 15
+y 8
+end
 arch cobblestones2
 x 15
 y 8
@@ -6028,14 +6032,14 @@ arch swall_2_1_2
 x 15
 y 8
 end
-arch dungeon_magic
-x 15
-y 8
-end
 arch cobblestones2
 x 15
 y 9
 end
+arch dungeon_magic
+x 15
+y 10
+end
 arch cobblestones2
 x 15
 y 10
@@ -6044,10 +6048,6 @@ arch swall_1_4
 x 15
 y 10
 end
-arch dungeon_magic
-x 15
-y 10
-end
 arch stonefloor2
 x 15
 y 11
@@ -6110,8 +6110,8 @@ resist_holyword 90
 resist_blind 90
 path_attuned 4
 randomitems sorcery_book_high
-see_invisible 1
 pick_up 4
+see_invisible 1
 can_cast_spell 1
 arch dagger
 name Yolanda
@@ -6514,6 +6514,10 @@ arch cobblestones
 x 15
 y 46
 end
+arch dungeon_magic
+x 15
+y 47
+end
 arch cobblestones2
 x 15
 y 47
@@ -6523,10 +6527,6 @@ face swall_AA.111
 x 15
 y 47
 end
-arch dungeon_magic
-x 15
-y 47
-end
 arch cobblestones2
 x 15
 y 48
@@ -6535,6 +6535,10 @@ arch cobblestones2
 x 15
 y 49
 end
+arch dungeon_magic
+x 15
+y 50
+end
 arch cobblestones2
 x 15
 y 50
@@ -6544,10 +6548,6 @@ face swall_AA.111
 x 15
 y 50
 end
-arch dungeon_magic
-x 15
-y 50
-end
 arch brush
 x 15
 y 51
@@ -6567,11 +6567,11 @@ name moat
 x 15
 y 54
 end
-arch brush
+arch dungeon_magic
 x 15
 y 55
 end
-arch dungeon_magic
+arch brush
 x 15
 y 55
 end
@@ -6608,11 +6608,11 @@ arch brush
 x 16
 y 2
 end
-arch brush
+arch dungeon_magic
 x 16
 y 3
 end
-arch dungeon_magic
+arch brush
 x 16
 y 3
 end
@@ -6635,6 +6635,10 @@ arch brush
 x 16
 y 7
 end
+arch dungeon_magic
+x 16
+y 8
+end
 arch cobblestones2
 x 16
 y 8
@@ -6643,14 +6647,14 @@ arch swall_1_3
 x 16
 y 8
 end
-arch dungeon_magic
-x 16
-y 8
-end
 arch cobblestones2
 x 16
 y 9
 end
+arch dungeon_magic
+x 16
+y 10
+end
 arch cobblestones2
 x 16
 y 10
@@ -6659,10 +6663,6 @@ arch swall_1_3
 x 16
 y 10
 end
-arch dungeon_magic
-x 16
-y 10
-end
 arch stonefloor2
 x 16
 y 11
@@ -7008,11 +7008,11 @@ name moat
 x 16
 y 54
 end
-arch brush
+arch dungeon_magic
 x 16
 y 55
 end
-arch dungeon_magic
+arch brush
 x 16
 y 55
 end
@@ -7049,11 +7049,11 @@ arch brush
 x 17
 y 2
 end
-arch brush
+arch dungeon_magic
 x 17
 y 3
 end
-arch dungeon_magic
+arch brush
 x 17
 y 3
 end
@@ -7601,11 +7601,11 @@ name moat
 x 17
 y 54
 end
-arch brush
+arch dungeon_magic
 x 17
 y 55
 end
-arch dungeon_magic
+arch brush
 x 17
 y 55
 end
@@ -7642,11 +7642,11 @@ arch brush
 x 18
 y 2
 end
-arch brush
+arch dungeon_magic
 x 18
 y 3
 end
-arch dungeon_magic
+arch brush
 x 18
 y 3
 end
@@ -8086,11 +8086,11 @@ name moat
 x 18
 y 54
 end
-arch brush
+arch dungeon_magic
 x 18
 y 55
 end
-arch dungeon_magic
+arch brush
 x 18
 y 55
 end
@@ -8127,11 +8127,11 @@ arch brush
 x 19
 y 2
 end
-arch brush
+arch dungeon_magic
 x 19
 y 3
 end
-arch dungeon_magic
+arch brush
 x 19
 y 3
 end
@@ -8154,6 +8154,10 @@ arch brush
 x 19
 y 7
 end
+arch dungeon_magic
+x 19
+y 8
+end
 arch cobblestones2
 x 19
 y 8
@@ -8162,14 +8166,14 @@ arch swall_1_4
 x 19
 y 8
 end
-arch dungeon_magic
-x 19
-y 8
-end
 arch cobblestones2
 x 19
 y 9
 end
+arch dungeon_magic
+x 19
+y 10
+end
 arch cobblestones2
 x 19
 y 10
@@ -8178,10 +8182,6 @@ arch swall_1_4
 x 19
 y 10
 end
-arch dungeon_magic
-x 19
-y 10
-end
 arch stonefloor2
 x 19
 y 11
@@ -8558,11 +8558,11 @@ name moat
 x 19
 y 54
 end
-arch brush
+arch dungeon_magic
 x 19
 y 55
 end
-arch dungeon_magic
+arch brush
 x 19
 y 55
 end
@@ -8599,11 +8599,11 @@ arch brush
 x 20
 y 2
 end
-arch brush
+arch dungeon_magic
 x 20
 y 3
 end
-arch dungeon_magic
+arch brush
 x 20
 y 3
 end
@@ -8626,6 +8626,10 @@ arch brush
 x 20
 y 7
 end
+arch dungeon_magic
+x 20
+y 8
+end
 arch cobblestones2
 x 20
 y 8
@@ -8634,14 +8638,14 @@ arch swall_2_1_2
 x 20
 y 8
 end
-arch dungeon_magic
-x 20
-y 8
-end
 arch cobblestones2
 x 20
 y 9
 end
+arch dungeon_magic
+x 20
+y 10
+end
 arch cobblestones2
 x 20
 y 10
@@ -8650,10 +8654,6 @@ arch swall_2_1_2
 x 20
 y 10
 end
-arch dungeon_magic
-x 20
-y 10
-end
 arch stonefloor2
 x 20
 y 11
@@ -8958,6 +8958,10 @@ arch cobblestones
 x 20
 y 46
 end
+arch dungeon_magic
+x 20
+y 47
+end
 arch cobblestones2
 x 20
 y 47
@@ -8967,10 +8971,6 @@ face swall_AA.111
 x 20
 y 47
 end
-arch dungeon_magic
-x 20
-y 47
-end
 arch cobblestones2
 x 20
 y 48
@@ -8979,6 +8979,10 @@ arch cobblestones2
 x 20
 y 49
 end
+arch dungeon_magic
+x 20
+y 50
+end
 arch cobblestones2
 x 20
 y 50
@@ -8988,10 +8992,6 @@ face swall_AA.111
 x 20
 y 50
 end
-arch dungeon_magic
-x 20
-y 50
-end
 arch brush
 x 20
 y 51
@@ -9011,11 +9011,11 @@ name moat
 x 20
 y 54
 end
-arch brush
+arch dungeon_magic
 x 20
 y 55
 end
-arch dungeon_magic
+arch brush
 x 20
 y 55
 end
@@ -9052,11 +9052,11 @@ arch brush
 x 21
 y 2
 end
-arch brush
+arch dungeon_magic
 x 21
 y 3
 end
-arch dungeon_magic
+arch brush
 x 21
 y 3
 end
@@ -9079,6 +9079,10 @@ arch brush
 x 21
 y 7
 end
+arch dungeon_magic
+x 21
+y 8
+end
 arch cobblestones2
 x 21
 y 8
@@ -9087,14 +9091,14 @@ arch swall_1_3
 x 21
 y 8
 end
-arch dungeon_magic
-x 21
-y 8
-end
 arch cobblestones2
 x 21
 y 9
 end
+arch dungeon_magic
+x 21
+y 10
+end
 arch cobblestones2
 x 21
 y 10
@@ -9103,10 +9107,6 @@ arch swall_1_3
 x 21
 y 10
 end
-arch dungeon_magic
-x 21
-y 10
-end
 arch cobblestones
 x 21
 y 11
@@ -9426,11 +9426,11 @@ name moat
 x 21
 y 54
 end
-arch brush
+arch dungeon_magic
 x 21
 y 55
 end
-arch dungeon_magic
+arch brush
 x 21
 y 55
 end
@@ -9467,11 +9467,11 @@ arch brush
 x 22
 y 2
 end
-arch brush
+arch dungeon_magic
 x 22
 y 3
 end
-arch dungeon_magic
+arch brush
 x 22
 y 3
 end
@@ -10175,11 +10175,11 @@ name moat
 x 22
 y 54
 end
-arch brush
+arch dungeon_magic
 x 22
 y 55
 end
-arch dungeon_magic
+arch brush
 x 22
 y 55
 end
@@ -10216,11 +10216,11 @@ arch brush
 x 23
 y 2
 end
-arch brush
+arch dungeon_magic
 x 23
 y 3
 end
-arch dungeon_magic
+arch brush
 x 23
 y 3
 end
@@ -10646,11 +10646,11 @@ name moat
 x 23
 y 54
 end
-arch brush
+arch dungeon_magic
 x 23
 y 55
 end
-arch dungeon_magic
+arch brush
 x 23
 y 55
 end
@@ -10687,11 +10687,11 @@ arch brush
 x 24
 y 2
 end
-arch brush
+arch dungeon_magic
 x 24
 y 3
 end
-arch dungeon_magic
+arch brush
 x 24
 y 3
 end
@@ -11263,6 +11263,10 @@ arch cobblestones2
 x 24
 y 49
 end
+arch dungeon_magic
+x 24
+y 50
+end
 arch cobblestones2
 x 24
 y 50
@@ -11272,10 +11276,6 @@ face swall_AA.111
 x 24
 y 50
 end
-arch dungeon_magic
-x 24
-y 50
-end
 arch brush
 x 24
 y 51
@@ -11295,11 +11295,11 @@ name moat
 x 24
 y 54
 end
-arch brush
+arch dungeon_magic
 x 24
 y 55
 end
-arch dungeon_magic
+arch brush
 x 24
 y 55
 end
@@ -11336,11 +11336,11 @@ arch brush
 x 25
 y 2
 end
-arch brush
+arch dungeon_magic
 x 25
 y 3
 end
-arch dungeon_magic
+arch brush
 x 25
 y 3
 end
@@ -11887,6 +11887,10 @@ name moat
 x 25
 y 54
 end
+arch dungeon_magic
+x 25
+y 55
+end
 arch brush
 x 25
 y 55
@@ -11896,10 +11900,6 @@ name ornamental pine
 x 25
 y 55
 end
-arch dungeon_magic
-x 25
-y 55
-end
 arch brush
 x 25
 y 56
@@ -11933,11 +11933,11 @@ arch brush
 x 26
 y 2
 end
-arch brush
+arch dungeon_magic
 x 26
 y 3
 end
-arch dungeon_magic
+arch brush
 x 26
 y 3
 end
@@ -12401,6 +12401,10 @@ name moat
 x 26
 y 54
 end
+arch dungeon_magic
+x 26
+y 55
+end
 arch brush
 x 26
 y 55
@@ -12410,10 +12414,6 @@ name ornamental pine
 x 26
 y 55
 end
-arch dungeon_magic
-x 26
-y 55
-end
 arch brush
 x 26
 y 56
@@ -12447,11 +12447,11 @@ arch brush
 x 27
 y 2
 end
-arch brush
+arch dungeon_magic
 x 27
 y 3
 end
-arch dungeon_magic
+arch brush
 x 27
 y 3
 end
@@ -12920,6 +12920,10 @@ x 27
 y 54
 move_block all
 end
+arch dungeon_magic
+x 27
+y 55
+end
 arch brush
 x 27
 y 55
@@ -12934,10 +12938,6 @@ x 27
 y 55
 move_block all
 end
-arch dungeon_magic
-x 27
-y 55
-end
 arch brush
 x 27
 y 56
@@ -12971,11 +12971,11 @@ arch brush
 x 28
 y 2
 end
-arch brush
+arch dungeon_magic
 x 28
 y 3
 end
-arch dungeon_magic
+arch brush
 x 28
 y 3
 end
@@ -12998,6 +12998,10 @@ arch brush
 x 28
 y 7
 end
+arch dungeon_magic
+x 28
+y 8
+end
 arch cobblestones2
 x 28
 y 8
@@ -13006,10 +13010,6 @@ arch swall_1_4
 x 28
 y 8
 end
-arch dungeon_magic
-x 28
-y 8
-end
 arch cobblestones2
 x 28
 y 9
@@ -14176,6 +14176,10 @@ arch cobblestones2
 x 28
 y 49
 end
+arch dungeon_magic
+x 28
+y 50
+end
 arch cobblestones2
 x 28
 y 50
@@ -14184,10 +14188,6 @@ arch swall_1_4
 x 28
 y 50
 end
-arch dungeon_magic
-x 28
-y 50
-end
 arch cobblestones2
 x 28
 y 51
@@ -14261,11 +14261,11 @@ arch brush
 x 29
 y 2
 end
-arch brush
+arch dungeon_magic
 x 29
 y 3
 end
-arch dungeon_magic
+arch brush
 x 29
 y 3
 end
@@ -14288,6 +14288,10 @@ arch brush
 x 29
 y 7
 end
+arch dungeon_magic
+x 29
+y 8
+end
 arch cobblestones2
 x 29
 y 8
@@ -14296,10 +14300,6 @@ arch swall_2_1_2
 x 29
 y 8
 end
-arch dungeon_magic
-x 29
-y 8
-end
 arch cobblestones2
 x 29
 y 9
@@ -14514,6 +14514,10 @@ arch cobblestones2
 x 29
 y 49
 end
+arch dungeon_magic
+x 29
+y 50
+end
 arch cobblestones2
 x 29
 y 50
@@ -14522,10 +14526,6 @@ arch swall_2_1_2
 x 29
 y 50
 end
-arch dungeon_magic
-x 29
-y 50
-end
 arch cobblestones2
 x 29
 y 51
@@ -14599,11 +14599,11 @@ arch brush
 x 30
 y 2
 end
-arch brush
+arch dungeon_magic
 x 30
 y 3
 end
-arch dungeon_magic
+arch brush
 x 30
 y 3
 end
@@ -14626,6 +14626,10 @@ arch brush
 x 30
 y 7
 end
+arch dungeon_magic
+x 30
+y 8
+end
 arch cobblestones2
 x 30
 y 8
@@ -14634,10 +14638,6 @@ arch swall_1_3
 x 30
 y 8
 end
-arch dungeon_magic
-x 30
-y 8
-end
 arch cobblestones2
 x 30
 y 9
@@ -15804,6 +15804,10 @@ arch cobblestones2
 x 30
 y 49
 end
+arch dungeon_magic
+x 30
+y 50
+end
 arch cobblestones2
 x 30
 y 50
@@ -15812,10 +15816,6 @@ arch swall_1_3
 x 30
 y 50
 end
-arch dungeon_magic
-x 30
-y 50
-end
 arch cobblestones2
 x 30
 y 51
@@ -15889,11 +15889,11 @@ arch brush
 x 31
 y 2
 end
-arch brush
+arch dungeon_magic
 x 31
 y 3
 end
-arch dungeon_magic
+arch brush
 x 31
 y 3
 end
@@ -16362,6 +16362,10 @@ x 31
 y 54
 move_block all
 end
+arch dungeon_magic
+x 31
+y 55
+end
 arch brush
 x 31
 y 55
@@ -16376,10 +16380,6 @@ x 31
 y 55
 move_block all
 end
-arch dungeon_magic
-x 31
-y 55
-end
 arch brush
 x 31
 y 56
@@ -16413,11 +16413,11 @@ arch brush
 x 32
 y 2
 end
-arch brush
+arch dungeon_magic
 x 32
 y 3
 end
-arch dungeon_magic
+arch brush
 x 32
 y 3
 end
@@ -16881,6 +16881,10 @@ name moat
 x 32
 y 54
 end
+arch dungeon_magic
+x 32
+y 55
+end
 arch brush
 x 32
 y 55
@@ -16890,10 +16894,6 @@ name ornamental pine
 x 32
 y 55
 end
-arch dungeon_magic
-x 32
-y 55
-end
 arch brush
 x 32
 y 56
@@ -16927,11 +16927,11 @@ arch brush
 x 33
 y 2
 end
-arch brush
+arch dungeon_magic
 x 33
 y 3
 end
-arch dungeon_magic
+arch brush
 x 33
 y 3
 end
@@ -17474,6 +17474,10 @@ name moat
 x 33
 y 54
 end
+arch dungeon_magic
+x 33
+y 55
+end
 arch brush
 x 33
 y 55
@@ -17483,10 +17487,6 @@ name ornamental pine
 x 33
 y 55
 end
-arch dungeon_magic
-x 33
-y 55
-end
 arch brush
 x 33
 y 56
@@ -17520,11 +17520,11 @@ arch brush
 x 34
 y 2
 end
-arch brush
+arch dungeon_magic
 x 34
 y 3
 end
-arch dungeon_magic
+arch brush
 x 34
 y 3
 end
@@ -18096,6 +18096,10 @@ arch cobblestones2
 x 34
 y 49
 end
+arch dungeon_magic
+x 34
+y 50
+end
 arch cobblestones2
 x 34
 y 50
@@ -18105,10 +18109,6 @@ face swall_AA.111
 x 34
 y 50
 end
-arch dungeon_magic
-x 34
-y 50
-end
 arch brush
 x 34
 y 51
@@ -18128,11 +18128,11 @@ name moat
 x 34
 y 54
 end
-arch brush
+arch dungeon_magic
 x 34
 y 55
 end
-arch dungeon_magic
+arch brush
 x 34
 y 55
 end
@@ -18169,11 +18169,11 @@ arch brush
 x 35
 y 2
 end
-arch brush
+arch dungeon_magic
 x 35
 y 3
 end
-arch dungeon_magic
+arch brush
 x 35
 y 3
 end
@@ -18599,11 +18599,11 @@ name moat
 x 35
 y 54
 end
-arch brush
+arch dungeon_magic
 x 35
 y 55
 end
-arch dungeon_magic
+arch brush
 x 35
 y 55
 end
@@ -18640,11 +18640,11 @@ arch brush
 x 36
 y 2
 end
-arch brush
+arch dungeon_magic
 x 36
 y 3
 end
-arch dungeon_magic
+arch brush
 x 36
 y 3
 end
@@ -19348,11 +19348,11 @@ name moat
 x 36
 y 54
 end
-arch brush
+arch dungeon_magic
 x 36
 y 55
 end
-arch dungeon_magic
+arch brush
 x 36
 y 55
 end
@@ -19389,11 +19389,11 @@ arch brush
 x 37
 y 2
 end
-arch brush
+arch dungeon_magic
 x 37
 y 3
 end
-arch dungeon_magic
+arch brush
 x 37
 y 3
 end
@@ -19416,6 +19416,10 @@ arch brush
 x 37
 y 7
 end
+arch dungeon_magic
+x 37
+y 8
+end
 arch cobblestones2
 x 37
 y 8
@@ -19424,14 +19428,14 @@ arch swall_1_4
 x 37
 y 8
 end
-arch dungeon_magic
-x 37
-y 8
-end
 arch cobblestones2
 x 37
 y 9
 end
+arch dungeon_magic
+x 37
+y 10
+end
 arch cobblestones2
 x 37
 y 10
@@ -19440,10 +19444,6 @@ arch swall_1_4
 x 37
 y 10
 end
-arch dungeon_magic
-x 37
-y 10
-end
 arch stonefloor2
 x 37
 y 11
@@ -19730,11 +19730,11 @@ name moat
 x 37
 y 54
 end
-arch brush
+arch dungeon_magic
 x 37
 y 55
 end
-arch dungeon_magic
+arch brush
 x 37
 y 55
 end
@@ -19771,11 +19771,11 @@ arch brush
 x 38
 y 2
 end
-arch brush
+arch dungeon_magic
 x 38
 y 3
 end
-arch dungeon_magic
+arch brush
 x 38
 y 3
 end
@@ -19798,6 +19798,10 @@ arch brush
 x 38
 y 7
 end
+arch dungeon_magic
+x 38
+y 8
+end
 arch cobblestones2
 x 38
 y 8
@@ -19806,14 +19810,14 @@ arch swall_2_1_2
 x 38
 y 8
 end
-arch dungeon_magic
-x 38
-y 8
-end
 arch cobblestones2
 x 38
 y 9
 end
+arch dungeon_magic
+x 38
+y 10
+end
 arch cobblestones2
 x 38
 y 10
@@ -19822,10 +19826,6 @@ arch swall_2_1_2
 x 38
 y 10
 end
-arch dungeon_magic
-x 38
-y 10
-end
 arch cobblestones
 x 38
 y 11
@@ -20112,6 +20112,10 @@ arch stonefloor2
 x 38
 y 46
 end
+arch dungeon_magic
+x 38
+y 47
+end
 arch cobblestones2
 x 38
 y 47
@@ -20121,10 +20125,6 @@ face swall_AA.111
 x 38
 y 47
 end
-arch dungeon_magic
-x 38
-y 47
-end
 arch cobblestones2
 x 38
 y 48
@@ -20133,6 +20133,10 @@ arch cobblestones2
 x 38
 y 49
 end
+arch dungeon_magic
+x 38
+y 50
+end
 arch cobblestones2
 x 38
 y 50
@@ -20142,10 +20146,6 @@ face swall_AA.111
 x 38
 y 50
 end
-arch dungeon_magic
-x 38
-y 50
-end
 arch brush
 x 38
 y 51
@@ -20165,11 +20165,11 @@ name moat
 x 38
 y 54
 end
-arch brush
+arch dungeon_magic
 x 38
 y 55
 end
-arch dungeon_magic
+arch brush
 x 38
 y 55
 end
@@ -20206,11 +20206,11 @@ arch brush
 x 39
 y 2
 end
-arch brush
+arch dungeon_magic
 x 39
 y 3
 end
-arch dungeon_magic
+arch brush
 x 39
 y 3
 end
@@ -20233,6 +20233,10 @@ arch brush
 x 39
 y 7
 end
+arch dungeon_magic
+x 39
+y 8
+end
 arch cobblestones2
 x 39
 y 8
@@ -20241,14 +20245,14 @@ arch swall_1_3
 x 39
 y 8
 end
-arch dungeon_magic
-x 39
-y 8
-end
 arch cobblestones2
 x 39
 y 9
 end
+arch dungeon_magic
+x 39
+y 10
+end
 arch cobblestones2
 x 39
 y 10
@@ -20257,10 +20261,6 @@ arch swall_1_3
 x 39
 y 10
 end
-arch dungeon_magic
-x 39
-y 10
-end
 arch cobblestones
 x 39
 y 11
@@ -20647,11 +20647,11 @@ name moat
 x 39
 y 54
 end
-arch brush
+arch dungeon_magic
 x 39
 y 55
 end
-arch dungeon_magic
+arch brush
 x 39
 y 55
 end
@@ -20688,11 +20688,11 @@ arch brush
 x 40
 y 2
 end
-arch brush
+arch dungeon_magic
 x 40
 y 3
 end
-arch dungeon_magic
+arch brush
 x 40
 y 3
 end
@@ -21122,11 +21122,11 @@ name moat
 x 40
 y 54
 end
-arch brush
+arch dungeon_magic
 x 40
 y 55
 end
-arch dungeon_magic
+arch brush
 x 40
 y 55
 end
@@ -21163,11 +21163,11 @@ arch brush
 x 41
 y 2
 end
-arch brush
+arch dungeon_magic
 x 41
 y 3
 end
-arch dungeon_magic
+arch brush
 x 41
 y 3
 end
@@ -21711,11 +21711,11 @@ name moat
 x 41
 y 54
 end
-arch brush
+arch dungeon_magic
 x 41
 y 55
 end
-arch dungeon_magic
+arch brush
 x 41
 y 55
 end
@@ -21752,11 +21752,11 @@ arch brush
 x 42
 y 2
 end
-arch brush
+arch dungeon_magic
 x 42
 y 3
 end
-arch dungeon_magic
+arch brush
 x 42
 y 3
 end
@@ -21779,6 +21779,10 @@ arch brush
 x 42
 y 7
 end
+arch dungeon_magic
+x 42
+y 8
+end
 arch cobblestones2
 x 42
 y 8
@@ -21787,14 +21791,14 @@ arch swall_1_4
 x 42
 y 8
 end
-arch dungeon_magic
-x 42
-y 8
-end
 arch cobblestones2
 x 42
 y 9
 end
+arch dungeon_magic
+x 42
+y 10
+end
 arch cobblestones2
 x 42
 y 10
@@ -21803,10 +21807,6 @@ arch swall_1_4
 x 42
 y 10
 end
-arch dungeon_magic
-x 42
-y 10
-end
 arch cobblestones
 x 42
 y 11
@@ -22156,11 +22156,11 @@ name moat
 x 42
 y 54
 end
-arch brush
+arch dungeon_magic
 x 42
 y 55
 end
-arch dungeon_magic
+arch brush
 x 42
 y 55
 end
@@ -22197,11 +22197,11 @@ arch brush
 x 43
 y 2
 end
-arch brush
+arch dungeon_magic
 x 43
 y 3
 end
-arch dungeon_magic
+arch brush
 x 43
 y 3
 end
@@ -22224,6 +22224,10 @@ arch brush
 x 43
 y 7
 end
+arch dungeon_magic
+x 43
+y 8
+end
 arch cobblestones2
 x 43
 y 8
@@ -22232,14 +22236,14 @@ arch swall_2_1_2
 x 43
 y 8
 end
-arch dungeon_magic
-x 43
-y 8
-end
 arch cobblestones2
 x 43
 y 9
 end
+arch dungeon_magic
+x 43
+y 10
+end
 arch cobblestones2
 x 43
 y 10
@@ -22248,10 +22252,6 @@ arch swall_1_3
 x 43
 y 10
 end
-arch dungeon_magic
-x 43
-y 10
-end
 arch cobblestones
 x 43
 y 11
@@ -22631,6 +22631,10 @@ arch stonefloor2
 x 43
 y 46
 end
+arch dungeon_magic
+x 43
+y 47
+end
 arch cobblestones2
 x 43
 y 47
@@ -22640,10 +22644,6 @@ face swall_AA.111
 x 43
 y 47
 end
-arch dungeon_magic
-x 43
-y 47
-end
 arch cobblestones2
 x 43
 y 48
@@ -22652,6 +22652,10 @@ arch cobblestones2
 x 43
 y 49
 end
+arch dungeon_magic
+x 43
+y 50
+end
 arch cobblestones2
 x 43
 y 50
@@ -22661,10 +22665,6 @@ face swall_AA.111
 x 43
 y 50
 end
-arch dungeon_magic
-x 43
-y 50
-end
 arch brush
 x 43
 y 51
@@ -22684,11 +22684,11 @@ name moat
 x 43
 y 54
 end
-arch brush
+arch dungeon_magic
 x 43
 y 55
 end
-arch dungeon_magic
+arch brush
 x 43
 y 55
 end
@@ -22725,11 +22725,11 @@ arch brush
 x 44
 y 2
 end
-arch brush
+arch dungeon_magic
 x 44
 y 3
 end
-arch dungeon_magic
+arch brush
 x 44
 y 3
 end
@@ -22752,6 +22752,10 @@ arch brush
 x 44
 y 7
 end
+arch dungeon_magic
+x 44
+y 8
+end
 arch cobblestones2
 x 44
 y 8
@@ -22760,10 +22764,6 @@ arch swall_1_3
 x 44
 y 8
 end
-arch dungeon_magic
-x 44
-y 8
-end
 arch cobblestones2
 x 44
 y 9
@@ -23249,11 +23249,11 @@ name moat
 x 44
 y 54
 end
-arch brush
+arch dungeon_magic
 x 44
 y 55
 end
-arch dungeon_magic
+arch brush
 x 44
 y 55
 end
@@ -23290,11 +23290,11 @@ arch brush
 x 45
 y 2
 end
-arch brush
+arch dungeon_magic
 x 45
 y 3
 end
-arch dungeon_magic
+arch brush
 x 45
 y 3
 end
@@ -23850,11 +23850,11 @@ name moat
 x 45
 y 54
 end
-arch brush
+arch dungeon_magic
 x 45
 y 55
 end
-arch dungeon_magic
+arch brush
 x 45
 y 55
 end
@@ -23891,11 +23891,11 @@ arch brush
 x 46
 y 2
 end
-arch brush
+arch dungeon_magic
 x 46
 y 3
 end
-arch dungeon_magic
+arch brush
 x 46
 y 3
 end
@@ -24411,11 +24411,11 @@ name moat
 x 46
 y 54
 end
-arch brush
+arch dungeon_magic
 x 46
 y 55
 end
-arch dungeon_magic
+arch brush
 x 46
 y 55
 end
@@ -24452,11 +24452,11 @@ arch brush
 x 47
 y 2
 end
-arch brush
+arch dungeon_magic
 x 47
 y 3
 end
-arch dungeon_magic
+arch brush
 x 47
 y 3
 end
@@ -24901,11 +24901,11 @@ name moat
 x 47
 y 54
 end
-arch brush
+arch dungeon_magic
 x 47
 y 55
 end
-arch dungeon_magic
+arch brush
 x 47
 y 55
 end
@@ -24942,11 +24942,11 @@ arch brush
 x 48
 y 2
 end
-arch brush
+arch dungeon_magic
 x 48
 y 3
 end
-arch dungeon_magic
+arch brush
 x 48
 y 3
 end
@@ -25016,6 +25016,10 @@ arch dwall_2_2_4
 x 48
 y 12
 end
+arch dungeon_magic
+x 48
+y 13
+end
 arch cobblestones2
 x 48
 y 13
@@ -25026,7 +25030,7 @@ y 13
 end
 arch dungeon_magic
 x 48
-y 13
+y 14
 end
 arch cobblestones2
 x 48
@@ -25036,10 +25040,6 @@ arch swall_1_2
 x 48
 y 14
 end
-arch dungeon_magic
-x 48
-y 14
-end
 arch cobblestones2
 x 48
 y 15
@@ -25104,6 +25104,10 @@ arch dwall_1_2
 x 48
 y 22
 end
+arch dungeon_magic
+x 48
+y 23
+end
 arch cobblestones2
 x 48
 y 23
@@ -25114,7 +25118,7 @@ y 23
 end
 arch dungeon_magic
 x 48
-y 23
+y 24
 end
 arch cobblestones2
 x 48
@@ -25124,10 +25128,6 @@ arch swall_1_2
 x 48
 y 24
 end
-arch dungeon_magic
-x 48
-y 24
-end
 arch cobblestones2
 x 48
 y 25
@@ -25196,6 +25196,10 @@ arch dwall_1_2
 x 48
 y 32
 end
+arch dungeon_magic
+x 48
+y 33
+end
 arch cobblestones2
 x 48
 y 33
@@ -25206,7 +25210,7 @@ y 33
 end
 arch dungeon_magic
 x 48
-y 33
+y 34
 end
 arch cobblestones2
 x 48
@@ -25216,10 +25220,6 @@ arch swall_1_2
 x 48
 y 34
 end
-arch dungeon_magic
-x 48
-y 34
-end
 arch cobblestones2
 x 48
 y 35
@@ -25276,6 +25276,10 @@ arch dwall_1_2
 x 48
 y 41
 end
+arch dungeon_magic
+x 48
+y 42
+end
 arch cobblestones2
 x 48
 y 42
@@ -25286,7 +25290,7 @@ y 42
 end
 arch dungeon_magic
 x 48
-y 42
+y 43
 end
 arch cobblestones2
 x 48
@@ -25296,10 +25300,6 @@ arch swall_1_2
 x 48
 y 43
 end
-arch dungeon_magic
-x 48
-y 43
-end
 arch cobblestones2
 x 48
 y 44
@@ -25352,6 +25352,10 @@ arch cobblestones2
 x 48
 y 49
 end
+arch dungeon_magic
+x 48
+y 50
+end
 arch cobblestones2
 x 48
 y 50
@@ -25361,10 +25365,6 @@ face swall_AA.111
 x 48
 y 50
 end
-arch dungeon_magic
-x 48
-y 50
-end
 arch brush
 x 48
 y 51
@@ -25384,11 +25384,11 @@ name moat
 x 48
 y 54
 end
-arch brush
+arch dungeon_magic
 x 48
 y 55
 end
-arch dungeon_magic
+arch brush
 x 48
 y 55
 end
@@ -25425,11 +25425,11 @@ arch brush
 x 49
 y 2
 end
-arch brush
+arch dungeon_magic
 x 49
 y 3
 end
-arch dungeon_magic
+arch brush
 x 49
 y 3
 end
@@ -25728,11 +25728,11 @@ name moat
 x 49
 y 54
 end
-arch brush
+arch dungeon_magic
 x 49
 y 55
 end
-arch dungeon_magic
+arch brush
 x 49
 y 55
 end
@@ -25769,11 +25769,11 @@ arch brush
 x 50
 y 2
 end
-arch brush
+arch dungeon_magic
 x 50
 y 3
 end
-arch dungeon_magic
+arch brush
 x 50
 y 3
 end
@@ -25841,6 +25841,10 @@ arch cwall_1_2
 x 50
 y 12
 end
+arch dungeon_magic
+x 50
+y 13
+end
 arch cobblestones2
 x 50
 y 13
@@ -25851,7 +25855,7 @@ y 13
 end
 arch dungeon_magic
 x 50
-y 13
+y 14
 end
 arch cobblestones2
 x 50
@@ -25861,10 +25865,6 @@ arch swall_1_2
 x 50
 y 14
 end
-arch dungeon_magic
-x 50
-y 14
-end
 arch cobblestones2
 x 50
 y 15
@@ -25929,6 +25929,10 @@ arch cwall_1_2
 x 50
 y 22
 end
+arch dungeon_magic
+x 50
+y 23
+end
 arch cobblestones2
 x 50
 y 23
@@ -25939,7 +25943,7 @@ y 23
 end
 arch dungeon_magic
 x 50
-y 23
+y 24
 end
 arch cobblestones2
 x 50
@@ -25949,10 +25953,6 @@ arch swall_1_2
 x 50
 y 24
 end
-arch dungeon_magic
-x 50
-y 24
-end
 arch cobblestones2
 x 50
 y 25
@@ -25977,6 +25977,10 @@ arch cwall_1_2
 x 50
 y 27
 end
+arch dungeon_magic
+x 50
+y 28
+end
 arch cobblestones2
 x 50
 y 28
@@ -25987,7 +25991,7 @@ y 28
 end
 arch dungeon_magic
 x 50
-y 28
+y 29
 end
 arch cobblestones2
 x 50
@@ -25997,10 +26001,6 @@ arch swall_1_2
 x 50
 y 29
 end
-arch dungeon_magic
-x 50
-y 29
-end
 arch cobblestones2
 x 50
 y 30
@@ -26025,6 +26025,10 @@ arch cwall_1_2
 x 50
 y 32
 end
+arch dungeon_magic
+x 50
+y 33
+end
 arch cobblestones2
 x 50
 y 33
@@ -26035,7 +26039,7 @@ y 33
 end
 arch dungeon_magic
 x 50
-y 33
+y 34
 end
 arch cobblestones2
 x 50
@@ -26045,10 +26049,6 @@ arch swall_1_2
 x 50
 y 34
 end
-arch dungeon_magic
-x 50
-y 34
-end
 arch cobblestones2
 x 50
 y 35
@@ -26105,6 +26105,10 @@ arch cwall_1_2
 x 50
 y 41
 end
+arch dungeon_magic
+x 50
+y 42
+end
 arch cobblestones2
 x 50
 y 42
@@ -26115,7 +26119,7 @@ y 42
 end
 arch dungeon_magic
 x 50
-y 42
+y 43
 end
 arch cobblestones2
 x 50
@@ -26125,10 +26129,6 @@ arch swall_1_2
 x 50
 y 43
 end
-arch dungeon_magic
-x 50
-y 43
-end
 arch cobblestones2
 x 50
 y 44
@@ -26209,11 +26209,11 @@ name moat
 x 50
 y 54
 end
-arch brush
+arch dungeon_magic
 x 50
 y 55
 end
-arch dungeon_magic
+arch brush
 x 50
 y 55
 end
@@ -26250,11 +26250,11 @@ arch brush
 x 51
 y 2
 end
-arch brush
+arch dungeon_magic
 x 51
 y 3
 end
-arch dungeon_magic
+arch brush
 x 51
 y 3
 end
@@ -26648,11 +26648,11 @@ name moat
 x 51
 y 54
 end
-arch brush
+arch dungeon_magic
 x 51
 y 55
 end
-arch dungeon_magic
+arch brush
 x 51
 y 55
 end
@@ -26689,11 +26689,11 @@ arch brush
 x 52
 y 2
 end
-arch brush
+arch dungeon_magic
 x 52
 y 3
 end
-arch dungeon_magic
+arch brush
 x 52
 y 3
 end
@@ -26952,11 +26952,11 @@ name moat
 x 52
 y 54
 end
-arch brush
+arch dungeon_magic
 x 52
 y 55
 end
-arch dungeon_magic
+arch brush
 x 52
 y 55
 end
@@ -26993,11 +26993,11 @@ arch brush
 x 53
 y 2
 end
-arch brush
+arch dungeon_magic
 x 53
 y 3
 end
-arch dungeon_magic
+arch brush
 x 53
 y 3
 end
@@ -27256,11 +27256,11 @@ name moat
 x 53
 y 54
 end
-arch brush
+arch dungeon_magic
 x 53
 y 55
 end
-arch dungeon_magic
+arch brush
 x 53
 y 55
 end
@@ -27297,11 +27297,11 @@ arch brush
 x 54
 y 2
 end
-arch brush
+arch dungeon_magic
 x 54
 y 3
 end
-arch dungeon_magic
+arch brush
 x 54
 y 3
 end
@@ -27560,11 +27560,11 @@ name moat
 x 54
 y 54
 end
-arch brush
+arch dungeon_magic
 x 54
 y 55
 end
-arch dungeon_magic
+arch brush
 x 54
 y 55
 end
@@ -27601,17 +27601,17 @@ arch brush
 x 55
 y 2
 end
-arch brush
-x 55
-y 3
-end
 arch dungeon_magic
 x 55
 y 3
 end
+arch swall_1_2_half
+x 55
+y 3
+end
 arch brush
 x 55
-y 4
+y 3
 end
 arch dungeon_magic
 x 55
@@ -27619,7 +27619,7 @@ y 4
 end
 arch brush
 x 55
-y 5
+y 4
 end
 arch dungeon_magic
 x 55
@@ -27627,7 +27627,7 @@ y 5
 end
 arch brush
 x 55
-y 6
+y 5
 end
 arch dungeon_magic
 x 55
@@ -27635,6 +27635,14 @@ y 6
 end
 arch brush
 x 55
+y 6
+end
+arch dungeon_magic
+x 55
+y 7
+end
+arch brush
+x 55
 y 7
 end
 arch lamppost
@@ -27646,7 +27654,7 @@ move_block all
 end
 arch dungeon_magic
 x 55
-y 7
+y 8
 end
 arch brush
 x 55
@@ -27654,7 +27662,7 @@ y 8
 end
 arch dungeon_magic
 x 55
-y 8
+y 9
 end
 arch brush
 x 55
@@ -27662,7 +27670,7 @@ y 9
 end
 arch dungeon_magic
 x 55
-y 9
+y 10
 end
 arch brush
 x 55
@@ -27670,7 +27678,7 @@ y 10
 end
 arch dungeon_magic
 x 55
-y 10
+y 11
 end
 arch brush
 x 55
@@ -27678,7 +27686,7 @@ y 11
 end
 arch dungeon_magic
 x 55
-y 11
+y 12
 end
 arch brush
 x 55
@@ -27686,7 +27694,7 @@ y 12
 end
 arch dungeon_magic
 x 55
-y 12
+y 13
 end
 arch brush
 x 55
@@ -27694,7 +27702,7 @@ y 13
 end
 arch dungeon_magic
 x 55
-y 13
+y 14
 end
 arch brush
 x 55
@@ -27702,7 +27710,7 @@ y 14
 end
 arch dungeon_magic
 x 55
-y 14
+y 15
 end
 arch brush
 x 55
@@ -27710,7 +27718,7 @@ y 15
 end
 arch dungeon_magic
 x 55
-y 15
+y 16
 end
 arch brush
 x 55
@@ -27718,7 +27726,7 @@ y 16
 end
 arch dungeon_magic
 x 55
-y 16
+y 17
 end
 arch brush
 x 55
@@ -27726,7 +27734,7 @@ y 17
 end
 arch dungeon_magic
 x 55
-y 17
+y 18
 end
 arch brush
 x 55
@@ -27734,7 +27742,7 @@ y 18
 end
 arch dungeon_magic
 x 55
-y 18
+y 19
 end
 arch brush
 x 55
@@ -27742,7 +27750,7 @@ y 19
 end
 arch dungeon_magic
 x 55
-y 19
+y 20
 end
 arch brush
 x 55
@@ -27750,7 +27758,7 @@ y 20
 end
 arch dungeon_magic
 x 55
-y 20
+y 21
 end
 arch brush
 x 55
@@ -27758,7 +27766,7 @@ y 21
 end
 arch dungeon_magic
 x 55
-y 21
+y 22
 end
 arch brush
 x 55
@@ -27766,7 +27774,7 @@ y 22
 end
 arch dungeon_magic
 x 55
-y 22
+y 23
 end
 arch brush
 x 55
@@ -27774,7 +27782,7 @@ y 23
 end
 arch dungeon_magic
 x 55
-y 23
+y 24
 end
 arch brush
 x 55
@@ -27782,7 +27790,7 @@ y 24
 end
 arch dungeon_magic
 x 55
-y 24
+y 25
 end
 arch brush
 x 55
@@ -27790,7 +27798,7 @@ y 25
 end
 arch dungeon_magic
 x 55
-y 25
+y 26
 end
 arch brush
 x 55
@@ -27798,7 +27806,7 @@ y 26
 end
 arch dungeon_magic
 x 55
-y 26
+y 27
 end
 arch brush
 x 55
@@ -27806,7 +27814,7 @@ y 27
 end
 arch dungeon_magic
 x 55
-y 27
+y 28
 end
 arch brush
 x 55
@@ -27814,7 +27822,7 @@ y 28
 end
 arch dungeon_magic
 x 55
-y 28
+y 29
 end
 arch brush
 x 55
@@ -27822,7 +27830,7 @@ y 29
 end
 arch dungeon_magic
 x 55
-y 29
+y 30
 end
 arch brush
 x 55
@@ -27830,7 +27838,7 @@ y 30
 end
 arch dungeon_magic
 x 55
-y 30
+y 31
 end
 arch brush
 x 55
@@ -27838,7 +27846,7 @@ y 31
 end
 arch dungeon_magic
 x 55
-y 31
+y 32
 end
 arch brush
 x 55
@@ -27846,7 +27854,7 @@ y 32
 end
 arch dungeon_magic
 x 55
-y 32
+y 33
 end
 arch brush
 x 55
@@ -27854,7 +27862,7 @@ y 33
 end
 arch dungeon_magic
 x 55
-y 33
+y 34
 end
 arch brush
 x 55
@@ -27862,7 +27870,7 @@ y 34
 end
 arch dungeon_magic
 x 55
-y 34
+y 35
 end
 arch brush
 x 55
@@ -27870,7 +27878,7 @@ y 35
 end
 arch dungeon_magic
 x 55
-y 35
+y 36
 end
 arch brush
 x 55
@@ -27878,7 +27886,7 @@ y 36
 end
 arch dungeon_magic
 x 55
-y 36
+y 37
 end
 arch brush
 x 55
@@ -27886,7 +27894,7 @@ y 37
 end
 arch dungeon_magic
 x 55
-y 37
+y 38
 end
 arch brush
 x 55
@@ -27894,7 +27902,7 @@ y 38
 end
 arch dungeon_magic
 x 55
-y 38
+y 39
 end
 arch brush
 x 55
@@ -27902,7 +27910,7 @@ y 39
 end
 arch dungeon_magic
 x 55
-y 39
+y 40
 end
 arch brush
 x 55
@@ -27910,7 +27918,7 @@ y 40
 end
 arch dungeon_magic
 x 55
-y 40
+y 41
 end
 arch brush
 x 55
@@ -27918,7 +27926,7 @@ y 41
 end
 arch dungeon_magic
 x 55
-y 41
+y 42
 end
 arch brush
 x 55
@@ -27926,7 +27934,7 @@ y 42
 end
 arch dungeon_magic
 x 55
-y 42
+y 43
 end
 arch brush
 x 55
@@ -27934,7 +27942,7 @@ y 43
 end
 arch dungeon_magic
 x 55
-y 43
+y 44
 end
 arch brush
 x 55
@@ -27942,7 +27950,7 @@ y 44
 end
 arch dungeon_magic
 x 55
-y 44
+y 45
 end
 arch brush
 x 55
@@ -27950,7 +27958,7 @@ y 45
 end
 arch dungeon_magic
 x 55
-y 45
+y 46
 end
 arch brush
 x 55
@@ -27958,7 +27966,7 @@ y 46
 end
 arch dungeon_magic
 x 55
-y 46
+y 47
 end
 arch brush
 x 55
@@ -27966,7 +27974,7 @@ y 47
 end
 arch dungeon_magic
 x 55
-y 47
+y 48
 end
 arch brush
 x 55
@@ -27974,7 +27982,7 @@ y 48
 end
 arch dungeon_magic
 x 55
-y 48
+y 49
 end
 arch brush
 x 55
@@ -27982,7 +27990,7 @@ y 49
 end
 arch dungeon_magic
 x 55
-y 49
+y 50
 end
 arch brush
 x 55
@@ -27990,7 +27998,7 @@ y 50
 end
 arch dungeon_magic
 x 55
-y 50
+y 51
 end
 arch brush
 x 55
@@ -27998,7 +28006,7 @@ y 51
 end
 arch dungeon_magic
 x 55
-y 51
+y 52
 end
 arch brush
 x 55
@@ -28006,7 +28014,7 @@ y 52
 end
 arch dungeon_magic
 x 55
-y 52
+y 53
 end
 arch brush
 x 55
@@ -28014,7 +28022,7 @@ y 53
 end
 arch dungeon_magic
 x 55
-y 53
+y 54
 end
 arch brush
 x 55
@@ -28022,13 +28030,9 @@ y 54
 end
 arch dungeon_magic
 x 55
-y 54
-end
-arch brush
-x 55
 y 55
 end
-arch dungeon_magic
+arch brush
 x 55
 y 55
 end
diff --git a/brest/zorn/castle.upper.floor.three b/brest/zorn/castle.upper.floor.three
index 92244607a..1012884c3 100644
--- a/brest/zorn/castle.upper.floor.three
+++ b/brest/zorn/castle.upper.floor.three
@@ -698,17 +698,13 @@ arch brush
 x 3
 y 2
 end
-arch brush
-x 3
-y 3
-end
 arch dungeon_magic
 x 3
 y 3
 end
 arch brush
 x 3
-y 4
+y 3
 end
 arch dungeon_magic
 x 3
@@ -716,7 +712,7 @@ y 4
 end
 arch brush
 x 3
-y 5
+y 4
 end
 arch dungeon_magic
 x 3
@@ -724,7 +720,7 @@ y 5
 end
 arch brush
 x 3
-y 6
+y 5
 end
 arch dungeon_magic
 x 3
@@ -732,6 +728,14 @@ y 6
 end
 arch brush
 x 3
+y 6
+end
+arch dungeon_magic
+x 3
+y 7
+end
+arch brush
+x 3
 y 7
 end
 arch lamppost
@@ -743,7 +747,7 @@ move_block all
 end
 arch dungeon_magic
 x 3
-y 7
+y 8
 end
 arch brush
 x 3
@@ -751,7 +755,7 @@ y 8
 end
 arch dungeon_magic
 x 3
-y 8
+y 9
 end
 arch brush
 x 3
@@ -759,7 +763,7 @@ y 9
 end
 arch dungeon_magic
 x 3
-y 9
+y 10
 end
 arch brush
 x 3
@@ -767,7 +771,7 @@ y 10
 end
 arch dungeon_magic
 x 3
-y 10
+y 11
 end
 arch brush
 x 3
@@ -775,7 +779,7 @@ y 11
 end
 arch dungeon_magic
 x 3
-y 11
+y 12
 end
 arch brush
 x 3
@@ -783,7 +787,7 @@ y 12
 end
 arch dungeon_magic
 x 3
-y 12
+y 13
 end
 arch brush
 x 3
@@ -791,7 +795,7 @@ y 13
 end
 arch dungeon_magic
 x 3
-y 13
+y 14
 end
 arch brush
 x 3
@@ -799,7 +803,7 @@ y 14
 end
 arch dungeon_magic
 x 3
-y 14
+y 15
 end
 arch brush
 x 3
@@ -807,7 +811,7 @@ y 15
 end
 arch dungeon_magic
 x 3
-y 15
+y 16
 end
 arch brush
 x 3
@@ -815,7 +819,7 @@ y 16
 end
 arch dungeon_magic
 x 3
-y 16
+y 17
 end
 arch brush
 x 3
@@ -823,7 +827,7 @@ y 17
 end
 arch dungeon_magic
 x 3
-y 17
+y 18
 end
 arch brush
 x 3
@@ -831,7 +835,7 @@ y 18
 end
 arch dungeon_magic
 x 3
-y 18
+y 19
 end
 arch brush
 x 3
@@ -839,7 +843,7 @@ y 19
 end
 arch dungeon_magic
 x 3
-y 19
+y 20
 end
 arch brush
 x 3
@@ -847,7 +851,7 @@ y 20
 end
 arch dungeon_magic
 x 3
-y 20
+y 21
 end
 arch brush
 x 3
@@ -855,7 +859,7 @@ y 21
 end
 arch dungeon_magic
 x 3
-y 21
+y 22
 end
 arch brush
 x 3
@@ -863,7 +867,7 @@ y 22
 end
 arch dungeon_magic
 x 3
-y 22
+y 23
 end
 arch brush
 x 3
@@ -871,7 +875,7 @@ y 23
 end
 arch dungeon_magic
 x 3
-y 23
+y 24
 end
 arch brush
 x 3
@@ -879,7 +883,7 @@ y 24
 end
 arch dungeon_magic
 x 3
-y 24
+y 25
 end
 arch brush
 x 3
@@ -887,7 +891,7 @@ y 25
 end
 arch dungeon_magic
 x 3
-y 25
+y 26
 end
 arch brush
 x 3
@@ -895,7 +899,7 @@ y 26
 end
 arch dungeon_magic
 x 3
-y 26
+y 27
 end
 arch brush
 x 3
@@ -903,7 +907,7 @@ y 27
 end
 arch dungeon_magic
 x 3
-y 27
+y 28
 end
 arch brush
 x 3
@@ -911,7 +915,7 @@ y 28
 end
 arch dungeon_magic
 x 3
-y 28
+y 29
 end
 arch brush
 x 3
@@ -919,7 +923,7 @@ y 29
 end
 arch dungeon_magic
 x 3
-y 29
+y 30
 end
 arch brush
 x 3
@@ -927,7 +931,7 @@ y 30
 end
 arch dungeon_magic
 x 3
-y 30
+y 31
 end
 arch brush
 x 3
@@ -935,7 +939,7 @@ y 31
 end
 arch dungeon_magic
 x 3
-y 31
+y 32
 end
 arch brush
 x 3
@@ -943,7 +947,7 @@ y 32
 end
 arch dungeon_magic
 x 3
-y 32
+y 33
 end
 arch brush
 x 3
@@ -951,7 +955,7 @@ y 33
 end
 arch dungeon_magic
 x 3
-y 33
+y 34
 end
 arch brush
 x 3
@@ -959,7 +963,7 @@ y 34
 end
 arch dungeon_magic
 x 3
-y 34
+y 35
 end
 arch brush
 x 3
@@ -967,7 +971,7 @@ y 35
 end
 arch dungeon_magic
 x 3
-y 35
+y 36
 end
 arch brush
 x 3
@@ -975,7 +979,7 @@ y 36
 end
 arch dungeon_magic
 x 3
-y 36
+y 37
 end
 arch brush
 x 3
@@ -983,7 +987,7 @@ y 37
 end
 arch dungeon_magic
 x 3
-y 37
+y 38
 end
 arch brush
 x 3
@@ -991,7 +995,7 @@ y 38
 end
 arch dungeon_magic
 x 3
-y 38
+y 39
 end
 arch brush
 x 3
@@ -999,7 +1003,7 @@ y 39
 end
 arch dungeon_magic
 x 3
-y 39
+y 40
 end
 arch brush
 x 3
@@ -1007,7 +1011,7 @@ y 40
 end
 arch dungeon_magic
 x 3
-y 40
+y 41
 end
 arch brush
 x 3
@@ -1015,7 +1019,7 @@ y 41
 end
 arch dungeon_magic
 x 3
-y 41
+y 42
 end
 arch brush
 x 3
@@ -1023,7 +1027,7 @@ y 42
 end
 arch dungeon_magic
 x 3
-y 42
+y 43
 end
 arch brush
 x 3
@@ -1031,7 +1035,7 @@ y 43
 end
 arch dungeon_magic
 x 3
-y 43
+y 44
 end
 arch brush
 x 3
@@ -1039,7 +1043,7 @@ y 44
 end
 arch dungeon_magic
 x 3
-y 44
+y 45
 end
 arch brush
 x 3
@@ -1047,7 +1051,7 @@ y 45
 end
 arch dungeon_magic
 x 3
-y 45
+y 46
 end
 arch brush
 x 3
@@ -1055,7 +1059,7 @@ y 46
 end
 arch dungeon_magic
 x 3
-y 46
+y 47
 end
 arch brush
 x 3
@@ -1063,7 +1067,7 @@ y 47
 end
 arch dungeon_magic
 x 3
-y 47
+y 48
 end
 arch brush
 x 3
@@ -1071,7 +1075,7 @@ y 48
 end
 arch dungeon_magic
 x 3
-y 48
+y 49
 end
 arch brush
 x 3
@@ -1079,7 +1083,7 @@ y 49
 end
 arch dungeon_magic
 x 3
-y 49
+y 50
 end
 arch brush
 x 3
@@ -1087,7 +1091,7 @@ y 50
 end
 arch dungeon_magic
 x 3
-y 50
+y 51
 end
 arch brush
 x 3
@@ -1095,7 +1099,7 @@ y 51
 end
 arch dungeon_magic
 x 3
-y 51
+y 52
 end
 arch brush
 x 3
@@ -1103,7 +1107,7 @@ y 52
 end
 arch dungeon_magic
 x 3
-y 52
+y 53
 end
 arch brush
 x 3
@@ -1111,7 +1115,7 @@ y 53
 end
 arch dungeon_magic
 x 3
-y 53
+y 54
 end
 arch brush
 x 3
@@ -1119,13 +1123,9 @@ y 54
 end
 arch dungeon_magic
 x 3
-y 54
-end
-arch brush
-x 3
 y 55
 end
-arch dungeon_magic
+arch brush
 x 3
 y 55
 end
@@ -1162,11 +1162,11 @@ arch brush
 x 4
 y 2
 end
-arch brush
+arch dungeon_magic
 x 4
 y 3
 end
-arch dungeon_magic
+arch brush
 x 4
 y 3
 end
@@ -1425,11 +1425,11 @@ name moat
 x 4
 y 54
 end
-arch brush
+arch dungeon_magic
 x 4
 y 55
 end
-arch dungeon_magic
+arch brush
 x 4
 y 55
 end
@@ -1466,11 +1466,11 @@ arch brush
 x 5
 y 2
 end
-arch brush
+arch dungeon_magic
 x 5
 y 3
 end
-arch dungeon_magic
+arch brush
 x 5
 y 3
 end
@@ -1729,11 +1729,11 @@ name moat
 x 5
 y 54
 end
-arch brush
+arch dungeon_magic
 x 5
 y 55
 end
-arch dungeon_magic
+arch brush
 x 5
 y 55
 end
@@ -1770,11 +1770,11 @@ arch brush
 x 6
 y 2
 end
-arch brush
+arch dungeon_magic
 x 6
 y 3
 end
-arch dungeon_magic
+arch brush
 x 6
 y 3
 end
@@ -2033,11 +2033,11 @@ name moat
 x 6
 y 54
 end
-arch brush
+arch dungeon_magic
 x 6
 y 55
 end
-arch dungeon_magic
+arch brush
 x 6
 y 55
 end
@@ -2074,11 +2074,11 @@ arch brush
 x 7
 y 2
 end
-arch brush
+arch dungeon_magic
 x 7
 y 3
 end
-arch dungeon_magic
+arch brush
 x 7
 y 3
 end
@@ -2467,11 +2467,11 @@ name moat
 x 7
 y 54
 end
-arch brush
+arch dungeon_magic
 x 7
 y 55
 end
-arch dungeon_magic
+arch brush
 x 7
 y 55
 end
@@ -2508,11 +2508,11 @@ arch brush
 x 8
 y 2
 end
-arch brush
+arch dungeon_magic
 x 8
 y 3
 end
-arch dungeon_magic
+arch brush
 x 8
 y 3
 end
@@ -2580,6 +2580,10 @@ arch cwall_1_2
 x 8
 y 12
 end
+arch dungeon_magic
+x 8
+y 13
+end
 arch greenmarble
 x 8
 y 13
@@ -2590,7 +2594,7 @@ y 13
 end
 arch dungeon_magic
 x 8
-y 13
+y 14
 end
 arch greenmarble
 x 8
@@ -2600,10 +2604,6 @@ arch swall_1_2
 x 8
 y 14
 end
-arch dungeon_magic
-x 8
-y 14
-end
 arch greenmarble
 x 8
 y 15
@@ -2660,6 +2660,10 @@ arch cwall_1_2
 x 8
 y 21
 end
+arch dungeon_magic
+x 8
+y 22
+end
 arch greenmarble
 x 8
 y 22
@@ -2669,10 +2673,6 @@ face swall_55.111
 x 8
 y 22
 end
-arch dungeon_magic
-x 8
-y 22
-end
 arch greenmarble
 x 8
 y 23
@@ -2681,6 +2681,10 @@ arch cwall_1_4
 x 8
 y 23
 end
+arch dungeon_magic
+x 8
+y 24
+end
 arch greenmarble
 x 8
 y 24
@@ -2690,10 +2694,6 @@ face swall_55.111
 x 8
 y 24
 end
-arch dungeon_magic
-x 8
-y 24
-end
 arch greenmarble
 x 8
 y 25
@@ -2718,6 +2718,10 @@ arch cwall_1_2
 x 8
 y 27
 end
+arch dungeon_magic
+x 8
+y 28
+end
 arch greenmarble
 x 8
 y 28
@@ -2728,7 +2732,7 @@ y 28
 end
 arch dungeon_magic
 x 8
-y 28
+y 29
 end
 arch greenmarble
 x 8
@@ -2740,7 +2744,7 @@ y 29
 end
 arch dungeon_magic
 x 8
-y 29
+y 30
 end
 arch greenmarble
 x 8
@@ -2750,10 +2754,6 @@ arch swall_1_2
 x 8
 y 30
 end
-arch dungeon_magic
-x 8
-y 30
-end
 arch greenmarble
 x 8
 y 31
@@ -2778,6 +2778,10 @@ arch cwall_1_2
 x 8
 y 33
 end
+arch dungeon_magic
+x 8
+y 34
+end
 arch greenmarble
 x 8
 y 34
@@ -2787,10 +2791,6 @@ face swall_55.111
 x 8
 y 34
 end
-arch dungeon_magic
-x 8
-y 34
-end
 arch greenmarble
 x 8
 y 35
@@ -2847,6 +2847,10 @@ arch cwall_1_2
 x 8
 y 41
 end
+arch dungeon_magic
+x 8
+y 42
+end
 arch greenmarble
 x 8
 y 42
@@ -2857,7 +2861,7 @@ y 42
 end
 arch dungeon_magic
 x 8
-y 42
+y 43
 end
 arch greenmarble
 x 8
@@ -2867,10 +2871,6 @@ arch swall_1_2
 x 8
 y 43
 end
-arch dungeon_magic
-x 8
-y 43
-end
 arch greenmarble
 x 8
 y 44
@@ -2951,11 +2951,11 @@ name moat
 x 8
 y 54
 end
-arch brush
+arch dungeon_magic
 x 8
 y 55
 end
-arch dungeon_magic
+arch brush
 x 8
 y 55
 end
@@ -2992,11 +2992,11 @@ arch brush
 x 9
 y 2
 end
-arch brush
+arch dungeon_magic
 x 9
 y 3
 end
-arch dungeon_magic
+arch brush
 x 9
 y 3
 end
@@ -3430,11 +3430,11 @@ name moat
 x 9
 y 54
 end
-arch brush
+arch dungeon_magic
 x 9
 y 55
 end
-arch dungeon_magic
+arch brush
 x 9
 y 55
 end
@@ -3471,11 +3471,11 @@ arch brush
 x 10
 y 2
 end
-arch brush
+arch dungeon_magic
 x 10
 y 3
 end
-arch dungeon_magic
+arch brush
 x 10
 y 3
 end
@@ -3719,6 +3719,10 @@ arch random_scroll
 x 10
 y 49
 end
+arch dungeon_magic
+x 10
+y 50
+end
 arch greenmarble
 x 10
 y 50
@@ -3728,10 +3732,6 @@ face swall_AA.111
 x 10
 y 50
 end
-arch dungeon_magic
-x 10
-y 50
-end
 arch brush
 x 10
 y 51
@@ -3751,11 +3751,11 @@ name moat
 x 10
 y 54
 end
-arch brush
+arch dungeon_magic
 x 10
 y 55
 end
-arch dungeon_magic
+arch brush
 x 10
 y 55
 end
@@ -3792,11 +3792,11 @@ arch brush
 x 11
 y 2
 end
-arch brush
+arch dungeon_magic
 x 11
 y 3
 end
-arch dungeon_magic
+arch brush
 x 11
 y 3
 end
@@ -4067,11 +4067,11 @@ name moat
 x 11
 y 54
 end
-arch brush
+arch dungeon_magic
 x 11
 y 55
 end
-arch dungeon_magic
+arch brush
 x 11
 y 55
 end
@@ -4108,11 +4108,11 @@ arch brush
 x 12
 y 2
 end
-arch brush
+arch dungeon_magic
 x 12
 y 3
 end
-arch dungeon_magic
+arch brush
 x 12
 y 3
 end
@@ -4388,11 +4388,11 @@ name moat
 x 12
 y 54
 end
-arch brush
+arch dungeon_magic
 x 12
 y 55
 end
-arch dungeon_magic
+arch brush
 x 12
 y 55
 end
@@ -4429,11 +4429,11 @@ arch brush
 x 13
 y 2
 end
-arch brush
+arch dungeon_magic
 x 13
 y 3
 end
-arch dungeon_magic
+arch brush
 x 13
 y 3
 end
@@ -4506,6 +4506,66 @@ arch greenmarblelight
 x 13
 y 15
 end
+arch big_wiz
+name Pyromancy Scroll Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 13
+y 15
+level 108
+attacktype 86180
+resist_physical 65
+resist_fire 100
+resist_electricity 65
+resist_cold 65
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 2
+run_away 0
+arch rod_light
+hp 500
+maxhp 500
+sp 90
+level 110
+startequip 1
+end
+arch scroll_new
+sp 3
+nrof 10
+level 110
+end
+arch scroll_new
+sp 6
+nrof 10
+level 110
+end
+arch scroll_new
+sp 57
+nrof 10
+level 110
+end
+arch key2
+name pyromancy scroll key
+name_pl pyromancy scroll keys
+slaying pyromancy_scroll_key
+end
+arch stylus
+end
+end
 arch greenmarblelight
 x 13
 y 16
@@ -4640,6 +4700,67 @@ arch greenmarblemedium
 x 13
 y 42
 end
+arch big_wiz
+name Summoning Scroll Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 13
+y 42
+level 108
+attacktype 87169
+resist_physical 65
+resist_fire 65
+resist_electricity 65
+resist_cold 65
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 64
+arch rod_light
+hp 500
+maxhp 500
+sp 128
+level 110
+end
+arch scroll_new
+sp 91
+nrof 10
+level 110
+end
+arch scroll_new
+sp 65
+nrof 10
+level 110
+end
+arch scroll_new
+other_arch devil
+sp 9
+nrof 10
+level 110
+end
+arch key2
+name summoning scroll key
+name_pl summoning scroll keys
+slaying summoning_scroll_key
+end
+arch spell_magehound
+end
+arch stylus
+end
+end
 arch greenmarblemedium
 x 13
 y 43
@@ -4709,11 +4830,11 @@ name moat
 x 13
 y 54
 end
-arch brush
+arch dungeon_magic
 x 13
 y 55
 end
-arch dungeon_magic
+arch brush
 x 13
 y 55
 end
@@ -4750,11 +4871,11 @@ arch brush
 x 14
 y 2
 end
-arch brush
+arch dungeon_magic
 x 14
 y 3
 end
-arch dungeon_magic
+arch brush
 x 14
 y 3
 end
@@ -4777,6 +4898,10 @@ arch brush
 x 14
 y 7
 end
+arch dungeon_magic
+x 14
+y 8
+end
 arch greenmarble
 x 14
 y 8
@@ -4785,10 +4910,6 @@ arch swall_1_4
 x 14
 y 8
 end
-arch dungeon_magic
-x 14
-y 8
-end
 arch greenmarblemedium
 x 14
 y 9
@@ -5004,11 +5125,11 @@ name moat
 x 14
 y 54
 end
-arch brush
+arch dungeon_magic
 x 14
 y 55
 end
-arch dungeon_magic
+arch brush
 x 14
 y 55
 end
@@ -5045,11 +5166,11 @@ arch brush
 x 15
 y 2
 end
-arch brush
+arch dungeon_magic
 x 15
 y 3
 end
-arch dungeon_magic
+arch brush
 x 15
 y 3
 end
@@ -5072,6 +5193,10 @@ arch brush
 x 15
 y 7
 end
+arch dungeon_magic
+x 15
+y 8
+end
 arch greenmarble
 x 15
 y 8
@@ -5080,10 +5205,6 @@ arch swall_2_1_2
 x 15
 y 8
 end
-arch dungeon_magic
-x 15
-y 8
-end
 arch greenmarblelight
 x 15
 y 9
@@ -5256,6 +5377,10 @@ arch greenmarblemedium
 x 15
 y 49
 end
+arch dungeon_magic
+x 15
+y 50
+end
 arch greenmarble
 x 15
 y 50
@@ -5265,10 +5390,6 @@ face swall_AA.111
 x 15
 y 50
 end
-arch dungeon_magic
-x 15
-y 50
-end
 arch brush
 x 15
 y 51
@@ -5288,11 +5409,11 @@ name moat
 x 15
 y 54
 end
-arch brush
+arch dungeon_magic
 x 15
 y 55
 end
-arch dungeon_magic
+arch brush
 x 15
 y 55
 end
@@ -5329,11 +5450,11 @@ arch brush
 x 16
 y 2
 end
-arch brush
+arch dungeon_magic
 x 16
 y 3
 end
-arch dungeon_magic
+arch brush
 x 16
 y 3
 end
@@ -5356,6 +5477,10 @@ arch brush
 x 16
 y 7
 end
+arch dungeon_magic
+x 16
+y 8
+end
 arch greenmarble
 x 16
 y 8
@@ -5364,10 +5489,6 @@ arch swall_1_3
 x 16
 y 8
 end
-arch dungeon_magic
-x 16
-y 8
-end
 arch greenmarblelight
 x 16
 y 9
@@ -5567,11 +5688,11 @@ name moat
 x 16
 y 54
 end
-arch brush
+arch dungeon_magic
 x 16
 y 55
 end
-arch dungeon_magic
+arch brush
 x 16
 y 55
 end
@@ -5608,11 +5729,11 @@ arch brush
 x 17
 y 2
 end
-arch brush
+arch dungeon_magic
 x 17
 y 3
 end
-arch dungeon_magic
+arch brush
 x 17
 y 3
 end
@@ -5680,6 +5801,57 @@ arch greenmarblelight
 x 17
 y 15
 end
+arch big_wiz
+name Pyromancy Book Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 17
+y 15
+level 108
+attacktype 86180
+resist_physical 65
+resist_fire 100
+resist_electricity 65
+resist_cold 65
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 2
+run_away 0
+arch rod_light
+hp 500
+maxhp 500
+sp 90
+level 110
+startequip 1
+end
+arch pyro_book
+end
+arch pyro_book_l1
+end
+arch pyro_book_l1
+end
+arch key2
+name pyromancy book key
+name_pl pyromancy book keys
+slaying pyromancy_book_key
+end
+arch stylus
+end
+end
 arch greenmarblelight
 x 17
 y 16
@@ -5796,6 +5968,61 @@ arch greenmarblemedium
 x 17
 y 42
 end
+arch big_wiz
+name Summoning Book Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 17
+y 42
+level 108
+attacktype 87169
+resist_physical 65
+resist_fire 65
+resist_electricity 65
+resist_cold 65
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 64
+arch rod_light
+hp 500
+maxhp 500
+sp 123
+level 110
+end
+arch summoner_book
+value 200
+randomitems none
+arch spell_magehound
+end
+end
+arch summoner_book_l1
+end
+arch summoner_book_l1
+end
+arch key2
+name summoning book key
+name_pl summoning book keys
+slaying summoning_book_key
+end
+arch spell_magehound
+end
+arch stylus
+end
+end
 arch greenmarblemedium
 x 17
 y 43
@@ -5860,11 +6087,11 @@ name moat
 x 17
 y 54
 end
-arch brush
+arch dungeon_magic
 x 17
 y 55
 end
-arch dungeon_magic
+arch brush
 x 17
 y 55
 end
@@ -5901,11 +6128,11 @@ arch brush
 x 18
 y 2
 end
-arch brush
+arch dungeon_magic
 x 18
 y 3
 end
-arch dungeon_magic
+arch brush
 x 18
 y 3
 end
@@ -6163,11 +6390,11 @@ name moat
 x 18
 y 54
 end
-arch brush
+arch dungeon_magic
 x 18
 y 55
 end
-arch dungeon_magic
+arch brush
 x 18
 y 55
 end
@@ -6204,11 +6431,11 @@ arch brush
 x 19
 y 2
 end
-arch brush
+arch dungeon_magic
 x 19
 y 3
 end
-arch dungeon_magic
+arch brush
 x 19
 y 3
 end
@@ -6231,6 +6458,10 @@ arch brush
 x 19
 y 7
 end
+arch dungeon_magic
+x 19
+y 8
+end
 arch greenmarble
 x 19
 y 8
@@ -6239,10 +6470,6 @@ arch swall_1_4
 x 19
 y 8
 end
-arch dungeon_magic
-x 19
-y 8
-end
 arch greenmarblelight
 x 19
 y 9
@@ -6460,11 +6687,11 @@ name moat
 x 19
 y 54
 end
-arch brush
+arch dungeon_magic
 x 19
 y 55
 end
-arch dungeon_magic
+arch brush
 x 19
 y 55
 end
@@ -6501,11 +6728,11 @@ arch brush
 x 20
 y 2
 end
-arch brush
+arch dungeon_magic
 x 20
 y 3
 end
-arch dungeon_magic
+arch brush
 x 20
 y 3
 end
@@ -6528,6 +6755,10 @@ arch brush
 x 20
 y 7
 end
+arch dungeon_magic
+x 20
+y 8
+end
 arch greenmarble
 x 20
 y 8
@@ -6536,10 +6767,6 @@ arch swall_2_1_2
 x 20
 y 8
 end
-arch dungeon_magic
-x 20
-y 8
-end
 arch greenmarblelight
 x 20
 y 9
@@ -6730,6 +6957,10 @@ arch summoner_book_l1
 x 20
 y 49
 end
+arch dungeon_magic
+x 20
+y 50
+end
 arch greenmarble
 x 20
 y 50
@@ -6739,10 +6970,6 @@ face swall_AA.111
 x 20
 y 50
 end
-arch dungeon_magic
-x 20
-y 50
-end
 arch brush
 x 20
 y 51
@@ -6762,11 +6989,11 @@ name moat
 x 20
 y 54
 end
-arch brush
+arch dungeon_magic
 x 20
 y 55
 end
-arch dungeon_magic
+arch brush
 x 20
 y 55
 end
@@ -6803,11 +7030,11 @@ arch brush
 x 21
 y 2
 end
-arch brush
+arch dungeon_magic
 x 21
 y 3
 end
-arch dungeon_magic
+arch brush
 x 21
 y 3
 end
@@ -6830,6 +7057,10 @@ arch brush
 x 21
 y 7
 end
+arch dungeon_magic
+x 21
+y 8
+end
 arch greenmarble
 x 21
 y 8
@@ -6838,10 +7069,6 @@ arch swall_2_1_2
 x 21
 y 8
 end
-arch dungeon_magic
-x 21
-y 8
-end
 arch greenmarblemedium
 x 21
 y 9
@@ -7059,11 +7286,11 @@ name moat
 x 21
 y 54
 end
-arch brush
+arch dungeon_magic
 x 21
 y 55
 end
-arch dungeon_magic
+arch brush
 x 21
 y 55
 end
@@ -7100,11 +7327,11 @@ arch brush
 x 22
 y 2
 end
-arch brush
+arch dungeon_magic
 x 22
 y 3
 end
-arch dungeon_magic
+arch brush
 x 22
 y 3
 end
@@ -7132,6 +7359,10 @@ name ornamental pine
 x 22
 y 7
 end
+arch dungeon_magic
+x 22
+y 8
+end
 arch greenmarble
 x 22
 y 8
@@ -7140,10 +7371,6 @@ arch swall_1_3
 x 22
 y 8
 end
-arch dungeon_magic
-x 22
-y 8
-end
 arch greenmarblemedium
 x 22
 y 9
@@ -7460,11 +7687,11 @@ name moat
 x 22
 y 54
 end
-arch brush
+arch dungeon_magic
 x 22
 y 55
 end
-arch dungeon_magic
+arch brush
 x 22
 y 55
 end
@@ -7501,11 +7728,11 @@ arch brush
 x 23
 y 2
 end
-arch brush
+arch dungeon_magic
 x 23
 y 3
 end
-arch dungeon_magic
+arch brush
 x 23
 y 3
 end
@@ -7857,11 +8084,11 @@ name moat
 x 23
 y 54
 end
-arch brush
+arch dungeon_magic
 x 23
 y 55
 end
-arch dungeon_magic
+arch brush
 x 23
 y 55
 end
@@ -7898,11 +8125,11 @@ arch brush
 x 24
 y 2
 end
-arch brush
+arch dungeon_magic
 x 24
 y 3
 end
-arch dungeon_magic
+arch brush
 x 24
 y 3
 end
@@ -8102,6 +8329,10 @@ arch lightgreenmarble
 x 24
 y 49
 end
+arch dungeon_magic
+x 24
+y 50
+end
 arch greenmarble
 x 24
 y 50
@@ -8111,10 +8342,6 @@ face swall_AA.111
 x 24
 y 50
 end
-arch dungeon_magic
-x 24
-y 50
-end
 arch brush
 x 24
 y 51
@@ -8134,11 +8361,11 @@ name moat
 x 24
 y 54
 end
-arch brush
+arch dungeon_magic
 x 24
 y 55
 end
-arch dungeon_magic
+arch brush
 x 24
 y 55
 end
@@ -8175,11 +8402,11 @@ arch brush
 x 25
 y 2
 end
-arch brush
+arch dungeon_magic
 x 25
 y 3
 end
-arch dungeon_magic
+arch brush
 x 25
 y 3
 end
@@ -8231,6 +8458,33 @@ arch greenmarble
 x 25
 y 12
 end
+arch Cwyvern
+name Zorn wyvern of chaos
+title Guardian of the Treasure
+Con 50
+Wis 20
+Pow 50
+exp 2000000
+wc -75
+ac -75
+x 25
+y 12
+level 109
+attacktype 262429
+resist_magic 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_poison -25
+resist_slow 50
+resist_fear 100
+resist_deplete 50
+resist_chaos 50
+resist_godpower 20
+resist_holyword 50
+run_away 0
+end
 arch lightgreenmarble
 x 25
 y 13
@@ -8411,6 +8665,10 @@ name moat
 x 25
 y 54
 end
+arch dungeon_magic
+x 25
+y 55
+end
 arch brush
 x 25
 y 55
@@ -8420,10 +8678,6 @@ name ornamental pine
 x 25
 y 55
 end
-arch dungeon_magic
-x 25
-y 55
-end
 arch brush
 x 25
 y 56
@@ -8457,11 +8711,11 @@ arch brush
 x 26
 y 2
 end
-arch brush
+arch dungeon_magic
 x 26
 y 3
 end
-arch dungeon_magic
+arch brush
 x 26
 y 3
 end
@@ -8713,6 +8967,10 @@ name moat
 x 26
 y 54
 end
+arch dungeon_magic
+x 26
+y 55
+end
 arch brush
 x 26
 y 55
@@ -8722,10 +8980,6 @@ name ornamental pine
 x 26
 y 55
 end
-arch dungeon_magic
-x 26
-y 55
-end
 arch brush
 x 26
 y 56
@@ -8759,11 +9013,11 @@ arch brush
 x 27
 y 2
 end
-arch brush
+arch dungeon_magic
 x 27
 y 3
 end
-arch dungeon_magic
+arch brush
 x 27
 y 3
 end
@@ -9037,6 +9291,10 @@ x 27
 y 54
 move_block all
 end
+arch dungeon_magic
+x 27
+y 55
+end
 arch brush
 x 27
 y 55
@@ -9051,10 +9309,6 @@ x 27
 y 55
 move_block all
 end
-arch dungeon_magic
-x 27
-y 55
-end
 arch brush
 x 27
 y 56
@@ -9088,11 +9342,11 @@ arch brush
 x 28
 y 2
 end
-arch brush
+arch dungeon_magic
 x 28
 y 3
 end
-arch dungeon_magic
+arch brush
 x 28
 y 3
 end
@@ -9115,6 +9369,10 @@ arch brush
 x 28
 y 7
 end
+arch dungeon_magic
+x 28
+y 8
+end
 arch greenmarble
 x 28
 y 8
@@ -9123,10 +9381,6 @@ arch swall_1_4
 x 28
 y 8
 end
-arch dungeon_magic
-x 28
-y 8
-end
 arch redslate
 x 28
 y 9
@@ -9165,6 +9419,37 @@ arch redslate
 x 28
 y 13
 end
+arch big_chaos_dragon
+name Zorn dragon of chaos
+title Guardian of the Treasure
+Con 75
+Wis 20
+Pow 20
+sp 0
+maxsp 250
+exp 4500000
+dam 50
+wc -95
+ac -95
+x 28
+y 13
+level 110
+attacktype 262429
+resist_magic 75
+resist_confusion 75
+resist_acid 75
+resist_drain 75
+resist_weaponmagic 25
+resist_poison -25
+resist_slow 75
+resist_fear 100
+resist_deplete 75
+resist_chaos 75
+resist_godpower 20
+resist_holyword 75
+path_attuned 14
+run_away 0
+end
 arch redslate
 x 28
 y 14
@@ -9309,6 +9594,10 @@ arch redslate
 x 28
 y 49
 end
+arch dungeon_magic
+x 28
+y 50
+end
 arch greenmarble
 x 28
 y 50
@@ -9317,10 +9606,6 @@ arch swall_1_4
 x 28
 y 50
 end
-arch dungeon_magic
-x 28
-y 50
-end
 arch cobblestones2
 x 28
 y 51
@@ -9394,11 +9679,11 @@ arch brush
 x 29
 y 2
 end
-arch brush
+arch dungeon_magic
 x 29
 y 3
 end
-arch dungeon_magic
+arch brush
 x 29
 y 3
 end
@@ -9421,6 +9706,10 @@ arch brush
 x 29
 y 7
 end
+arch dungeon_magic
+x 29
+y 8
+end
 arch greenmarble
 x 29
 y 8
@@ -9429,10 +9718,6 @@ arch swall_2_1_2
 x 29
 y 8
 end
-arch dungeon_magic
-x 29
-y 8
-end
 arch redslate
 x 29
 y 9
@@ -9728,6 +10013,10 @@ arch redslate
 x 29
 y 49
 end
+arch dungeon_magic
+x 29
+y 50
+end
 arch greenmarble
 x 29
 y 50
@@ -9736,10 +10025,6 @@ arch swall_2_1_2
 x 29
 y 50
 end
-arch dungeon_magic
-x 29
-y 50
-end
 arch cobblestones2
 x 29
 y 51
@@ -9813,11 +10098,11 @@ arch brush
 x 30
 y 2
 end
-arch brush
+arch dungeon_magic
 x 30
 y 3
 end
-arch dungeon_magic
+arch brush
 x 30
 y 3
 end
@@ -9840,6 +10125,10 @@ arch brush
 x 30
 y 7
 end
+arch dungeon_magic
+x 30
+y 8
+end
 arch greenmarble
 x 30
 y 8
@@ -9848,10 +10137,6 @@ arch swall_1_3
 x 30
 y 8
 end
-arch dungeon_magic
-x 30
-y 8
-end
 arch redslate
 x 30
 y 9
@@ -10034,6 +10319,10 @@ arch redslate
 x 30
 y 49
 end
+arch dungeon_magic
+x 30
+y 50
+end
 arch greenmarble
 x 30
 y 50
@@ -10042,10 +10331,6 @@ arch swall_1_3
 x 30
 y 50
 end
-arch dungeon_magic
-x 30
-y 50
-end
 arch cobblestones2
 x 30
 y 51
@@ -10119,11 +10404,11 @@ arch brush
 x 31
 y 2
 end
-arch brush
+arch dungeon_magic
 x 31
 y 3
 end
-arch dungeon_magic
+arch brush
 x 31
 y 3
 end
@@ -10397,6 +10682,10 @@ x 31
 y 54
 move_block all
 end
+arch dungeon_magic
+x 31
+y 55
+end
 arch brush
 x 31
 y 55
@@ -10411,10 +10700,6 @@ x 31
 y 55
 move_block all
 end
-arch dungeon_magic
-x 31
-y 55
-end
 arch brush
 x 31
 y 56
@@ -10448,11 +10733,11 @@ arch brush
 x 32
 y 2
 end
-arch brush
+arch dungeon_magic
 x 32
 y 3
 end
-arch dungeon_magic
+arch brush
 x 32
 y 3
 end
@@ -10516,6 +10801,33 @@ arch greenmarble
 x 32
 y 12
 end
+arch Cwyvern
+name Zorn wyvern of chaos
+title Guardian of the Treasure
+Con 50
+Wis 20
+Pow 50
+exp 2000000
+wc -75
+ac -75
+x 32
+y 12
+level 109
+attacktype 262429
+resist_magic 50
+resist_confusion 50
+resist_acid 50
+resist_drain 50
+resist_weaponmagic 50
+resist_poison -25
+resist_slow 50
+resist_fear 100
+resist_deplete 50
+resist_chaos 50
+resist_godpower 20
+resist_holyword 50
+run_away 0
+end
 arch lightgreenmarble
 x 32
 y 13
@@ -10704,6 +11016,10 @@ name moat
 x 32
 y 54
 end
+arch dungeon_magic
+x 32
+y 55
+end
 arch brush
 x 32
 y 55
@@ -10713,10 +11029,6 @@ name ornamental pine
 x 32
 y 55
 end
-arch dungeon_magic
-x 32
-y 55
-end
 arch brush
 x 32
 y 56
@@ -10750,11 +11062,11 @@ arch brush
 x 33
 y 2
 end
-arch brush
+arch dungeon_magic
 x 33
 y 3
 end
-arch dungeon_magic
+arch brush
 x 33
 y 3
 end
@@ -10986,6 +11298,10 @@ name moat
 x 33
 y 54
 end
+arch dungeon_magic
+x 33
+y 55
+end
 arch brush
 x 33
 y 55
@@ -10995,10 +11311,6 @@ name ornamental pine
 x 33
 y 55
 end
-arch dungeon_magic
-x 33
-y 55
-end
 arch brush
 x 33
 y 56
@@ -11032,11 +11344,11 @@ arch brush
 x 34
 y 2
 end
-arch brush
+arch dungeon_magic
 x 34
 y 3
 end
-arch dungeon_magic
+arch brush
 x 34
 y 3
 end
@@ -11236,6 +11548,10 @@ arch greenmarble
 x 34
 y 49
 end
+arch dungeon_magic
+x 34
+y 50
+end
 arch greenmarble
 x 34
 y 50
@@ -11245,10 +11561,6 @@ face swall_AA.111
 x 34
 y 50
 end
-arch dungeon_magic
-x 34
-y 50
-end
 arch brush
 x 34
 y 51
@@ -11268,11 +11580,11 @@ name moat
 x 34
 y 54
 end
-arch brush
+arch dungeon_magic
 x 34
 y 55
 end
-arch dungeon_magic
+arch brush
 x 34
 y 55
 end
@@ -11309,11 +11621,11 @@ arch brush
 x 35
 y 2
 end
-arch brush
+arch dungeon_magic
 x 35
 y 3
 end
-arch dungeon_magic
+arch brush
 x 35
 y 3
 end
@@ -11665,11 +11977,11 @@ name moat
 x 35
 y 54
 end
-arch brush
+arch dungeon_magic
 x 35
 y 55
 end
-arch dungeon_magic
+arch brush
 x 35
 y 55
 end
@@ -11706,11 +12018,11 @@ arch brush
 x 36
 y 2
 end
-arch brush
+arch dungeon_magic
 x 36
 y 3
 end
-arch dungeon_magic
+arch brush
 x 36
 y 3
 end
@@ -11738,6 +12050,10 @@ name ornamental pine
 x 36
 y 7
 end
+arch dungeon_magic
+x 36
+y 8
+end
 arch greenmarble
 x 36
 y 8
@@ -11746,10 +12062,6 @@ arch swall_1_4
 x 36
 y 8
 end
-arch dungeon_magic
-x 36
-y 8
-end
 arch greenmarblemedium
 x 36
 y 9
@@ -12066,11 +12378,11 @@ name moat
 x 36
 y 54
 end
-arch brush
+arch dungeon_magic
 x 36
 y 55
 end
-arch dungeon_magic
+arch brush
 x 36
 y 55
 end
@@ -12107,11 +12419,11 @@ arch brush
 x 37
 y 2
 end
-arch brush
+arch dungeon_magic
 x 37
 y 3
 end
-arch dungeon_magic
+arch brush
 x 37
 y 3
 end
@@ -12134,6 +12446,10 @@ arch brush
 x 37
 y 7
 end
+arch dungeon_magic
+x 37
+y 8
+end
 arch greenmarble
 x 37
 y 8
@@ -12142,10 +12458,6 @@ arch swall_2_1_2
 x 37
 y 8
 end
-arch dungeon_magic
-x 37
-y 8
-end
 arch greenmarblemedium
 x 37
 y 9
@@ -12363,11 +12675,11 @@ name moat
 x 37
 y 54
 end
-arch brush
+arch dungeon_magic
 x 37
 y 55
 end
-arch dungeon_magic
+arch brush
 x 37
 y 55
 end
@@ -12404,11 +12716,11 @@ arch brush
 x 38
 y 2
 end
-arch brush
+arch dungeon_magic
 x 38
 y 3
 end
-arch dungeon_magic
+arch brush
 x 38
 y 3
 end
@@ -12431,6 +12743,10 @@ arch brush
 x 38
 y 7
 end
+arch dungeon_magic
+x 38
+y 8
+end
 arch greenmarble
 x 38
 y 8
@@ -12439,10 +12755,6 @@ arch swall_2_1_2
 x 38
 y 8
 end
-arch dungeon_magic
-x 38
-y 8
-end
 arch greenmarblelight
 x 38
 y 9
@@ -12633,6 +12945,10 @@ arch sorcerer_book_l1
 x 38
 y 49
 end
+arch dungeon_magic
+x 38
+y 50
+end
 arch greenmarble
 x 38
 y 50
@@ -12642,10 +12958,6 @@ face swall_AA.111
 x 38
 y 50
 end
-arch dungeon_magic
-x 38
-y 50
-end
 arch brush
 x 38
 y 51
@@ -12665,11 +12977,11 @@ name moat
 x 38
 y 54
 end
-arch brush
+arch dungeon_magic
 x 38
 y 55
 end
-arch dungeon_magic
+arch brush
 x 38
 y 55
 end
@@ -12706,11 +13018,11 @@ arch brush
 x 39
 y 2
 end
-arch brush
+arch dungeon_magic
 x 39
 y 3
 end
-arch dungeon_magic
+arch brush
 x 39
 y 3
 end
@@ -12733,6 +13045,10 @@ arch brush
 x 39
 y 7
 end
+arch dungeon_magic
+x 39
+y 8
+end
 arch greenmarble
 x 39
 y 8
@@ -12741,10 +13057,6 @@ arch swall_1_3
 x 39
 y 8
 end
-arch dungeon_magic
-x 39
-y 8
-end
 arch greenmarblelight
 x 39
 y 9
@@ -12962,11 +13274,11 @@ name moat
 x 39
 y 54
 end
-arch brush
+arch dungeon_magic
 x 39
 y 55
 end
-arch dungeon_magic
+arch brush
 x 39
 y 55
 end
@@ -13003,11 +13315,11 @@ arch brush
 x 40
 y 2
 end
-arch brush
+arch dungeon_magic
 x 40
 y 3
 end
-arch dungeon_magic
+arch brush
 x 40
 y 3
 end
@@ -13072,6 +13384,66 @@ arch greenmarblemedium
 x 40
 y 13
 end
+arch big_wiz
+name Evocation Scroll Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 40
+y 13
+level 108
+attacktype 86192
+resist_physical 65
+resist_fire 65
+resist_electricity 65
+resist_cold 100
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 4
+run_away 0
+arch rod_light
+hp 500
+maxhp 500
+sp 88
+level 110
+startequip 1
+end
+arch scroll_new
+sp 180
+nrof 10
+level 110
+end
+arch scroll_new
+sp 17
+nrof 10
+level 110
+end
+arch scroll_new
+sp 113
+nrof 10
+level 110
+end
+arch key2
+name evocation scroll key
+name_pl evocation scroll keys
+slaying evocation_scroll_key
+end
+arch stylus
+end
+end
 arch greenmarblemedium
 x 40
 y 14
@@ -13200,6 +13572,66 @@ arch greenmarblelight
 x 40
 y 43
 end
+arch big_wiz
+name Sorcery Scroll Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 40
+y 43
+level 108
+attacktype 87200
+resist_physical 65
+resist_fire 65
+resist_electricity 65
+resist_cold 65
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 16
+run_away 0
+arch scroll_new
+sp 64
+nrof 10
+level 110
+end
+arch scroll_new
+sp 23
+nrof 10
+level 110
+end
+arch scroll_new
+sp 63
+nrof 10
+level 110
+end
+arch key2
+name sorcery scroll key
+name_pl sorcery scroll keys
+slaying sorcery_scroll_key
+end
+arch rod_light
+hp 500
+maxhp 500
+sp 85
+level 110
+startequip 1
+end
+arch stylus
+end
+end
 arch greenmarblemedium
 x 40
 y 44
@@ -13265,11 +13697,11 @@ name moat
 x 40
 y 54
 end
-arch brush
+arch dungeon_magic
 x 40
 y 55
 end
-arch dungeon_magic
+arch brush
 x 40
 y 55
 end
@@ -13306,11 +13738,11 @@ arch brush
 x 41
 y 2
 end
-arch brush
+arch dungeon_magic
 x 41
 y 3
 end
-arch dungeon_magic
+arch brush
 x 41
 y 3
 end
@@ -13558,11 +13990,11 @@ name moat
 x 41
 y 54
 end
-arch brush
+arch dungeon_magic
 x 41
 y 55
 end
-arch dungeon_magic
+arch brush
 x 41
 y 55
 end
@@ -13599,11 +14031,11 @@ arch brush
 x 42
 y 2
 end
-arch brush
+arch dungeon_magic
 x 42
 y 3
 end
-arch dungeon_magic
+arch brush
 x 42
 y 3
 end
@@ -13626,6 +14058,10 @@ arch brush
 x 42
 y 7
 end
+arch dungeon_magic
+x 42
+y 8
+end
 arch greenmarble
 x 42
 y 8
@@ -13634,10 +14070,6 @@ arch swall_1_4
 x 42
 y 8
 end
-arch dungeon_magic
-x 42
-y 8
-end
 arch greenmarblelight
 x 42
 y 9
@@ -13837,11 +14269,11 @@ name moat
 x 42
 y 54
 end
-arch brush
+arch dungeon_magic
 x 42
 y 55
 end
-arch dungeon_magic
+arch brush
 x 42
 y 55
 end
@@ -13878,11 +14310,11 @@ arch brush
 x 43
 y 2
 end
-arch brush
+arch dungeon_magic
 x 43
 y 3
 end
-arch dungeon_magic
+arch brush
 x 43
 y 3
 end
@@ -13905,6 +14337,10 @@ arch brush
 x 43
 y 7
 end
+arch dungeon_magic
+x 43
+y 8
+end
 arch greenmarble
 x 43
 y 8
@@ -13913,10 +14349,6 @@ arch swall_2_1_2
 x 43
 y 8
 end
-arch dungeon_magic
-x 43
-y 8
-end
 arch greenmarblelight
 x 43
 y 9
@@ -14089,6 +14521,10 @@ arch greenmarblelight
 x 43
 y 49
 end
+arch dungeon_magic
+x 43
+y 50
+end
 arch greenmarble
 x 43
 y 50
@@ -14098,10 +14534,6 @@ face swall_AA.111
 x 43
 y 50
 end
-arch dungeon_magic
-x 43
-y 50
-end
 arch brush
 x 43
 y 51
@@ -14121,11 +14553,11 @@ name moat
 x 43
 y 54
 end
-arch brush
+arch dungeon_magic
 x 43
 y 55
 end
-arch dungeon_magic
+arch brush
 x 43
 y 55
 end
@@ -14162,11 +14594,11 @@ arch brush
 x 44
 y 2
 end
-arch brush
+arch dungeon_magic
 x 44
 y 3
 end
-arch dungeon_magic
+arch brush
 x 44
 y 3
 end
@@ -14189,6 +14621,10 @@ arch brush
 x 44
 y 7
 end
+arch dungeon_magic
+x 44
+y 8
+end
 arch greenmarble
 x 44
 y 8
@@ -14197,10 +14633,6 @@ arch swall_1_3
 x 44
 y 8
 end
-arch dungeon_magic
-x 44
-y 8
-end
 arch greenmarblemedium
 x 44
 y 9
@@ -14225,6 +14657,57 @@ arch greenmarblemedium
 x 44
 y 13
 end
+arch big_wiz
+name Evocation Book Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 44
+y 13
+level 108
+attacktype 86192
+resist_physical 65
+resist_fire 65
+resist_electricity 65
+resist_cold 100
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 4
+run_away 0
+arch evoker_book
+end
+arch evoker_book_l1
+end
+arch evoker_book_l1
+end
+arch key2
+name evocation book key
+name_pl evocation book keys
+slaying evocation_book_key
+end
+arch rod_light
+hp 500
+maxhp 500
+sp 88
+level 110
+startequip 1
+end
+arch stylus
+end
+end
 arch greenmarblemedium
 x 44
 y 14
@@ -14361,6 +14844,57 @@ arch greenmarblelight
 x 44
 y 43
 end
+arch big_wiz
+name Sorcery Book Writer
+title of Zorn
+Con 35
+Pow 50
+hp 5000
+maxhp 5000
+sp 250
+maxsp 250
+exp 1000000
+wc -30
+ac -25
+x 44
+y 43
+level 108
+attacktype 87200
+resist_physical 65
+resist_fire 65
+resist_electricity 65
+resist_cold 65
+resist_confusion 65
+resist_acid 65
+resist_drain 65
+resist_weaponmagic 65
+resist_slow -25
+resist_deplete 65
+resist_death 65
+resist_chaos 65
+path_attuned 16
+run_away 0
+arch sorcerer_book
+end
+arch sorcerer_book_l1
+end
+arch sorcerer_book_l1
+end
+arch key2
+name sorcery book key
+name_pl sorcery book keys
+slaying sorcery_book_key
+end
+arch rod_light
+hp 500
+maxhp 500
+sp 85
+level 110
+startequip 1
+end
+arch stylus
+end
+end
 arch greenmarblemedium
 x 44
 y 44
@@ -14416,11 +14950,11 @@ name moat
 x 44
 y 54
 end
-arch brush
+arch dungeon_magic
 x 44
 y 55
 end
-arch dungeon_magic
+arch brush
 x 44
 y 55
 end
@@ -14457,11 +14991,11 @@ arch brush
 x 45
 y 2
 end
-arch brush
+arch dungeon_magic
 x 45
 y 3
 end
-arch dungeon_magic
+arch brush
 x 45
 y 3
 end
@@ -14737,11 +15271,11 @@ name moat
 x 45
 y 54
 end
-arch brush
+arch dungeon_magic
 x 45
 y 55
 end
-arch dungeon_magic
+arch brush
 x 45
 y 55
 end
@@ -14778,11 +15312,11 @@ arch brush
 x 46
 y 2
 end
-arch brush
+arch dungeon_magic
 x 46
 y 3
 end
-arch dungeon_magic
+arch brush
 x 46
 y 3
 end
@@ -15058,11 +15592,11 @@ name moat
 x 46
 y 54
 end
-arch brush
+arch dungeon_magic
 x 46
 y 55
 end
-arch dungeon_magic
+arch brush
 x 46
 y 55
 end
@@ -15099,11 +15633,11 @@ arch brush
 x 47
 y 2
 end
-arch brush
+arch dungeon_magic
 x 47
 y 3
 end
-arch dungeon_magic
+arch brush
 x 47
 y 3
 end
@@ -15374,11 +15908,11 @@ name moat
 x 47
 y 54
 end
-arch brush
+arch dungeon_magic
 x 47
 y 55
 end
-arch dungeon_magic
+arch brush
 x 47
 y 55
 end
@@ -15415,11 +15949,11 @@ arch brush
 x 48
 y 2
 end
-arch brush
+arch dungeon_magic
 x 48
 y 3
 end
-arch dungeon_magic
+arch brush
 x 48
 y 3
 end
@@ -15663,6 +16197,10 @@ arch random_scroll
 x 48
 y 49
 end
+arch dungeon_magic
+x 48
+y 50
+end
 arch greenmarble
 x 48
 y 50
@@ -15672,10 +16210,6 @@ face swall_AA.111
 x 48
 y 50
 end
-arch dungeon_magic
-x 48
-y 50
-end
 arch brush
 x 48
 y 51
@@ -15695,11 +16229,11 @@ name moat
 x 48
 y 54
 end
-arch brush
+arch dungeon_magic
 x 48
 y 55
 end
-arch dungeon_magic
+arch brush
 x 48
 y 55
 end
@@ -15736,11 +16270,11 @@ arch brush
 x 49
 y 2
 end
-arch brush
+arch dungeon_magic
 x 49
 y 3
 end
-arch dungeon_magic
+arch brush
 x 49
 y 3
 end
@@ -16179,11 +16713,11 @@ name moat
 x 49
 y 54
 end
-arch brush
+arch dungeon_magic
 x 49
 y 55
 end
-arch dungeon_magic
+arch brush
 x 49
 y 55
 end
@@ -16220,11 +16754,11 @@ arch brush
 x 50
 y 2
 end
-arch brush
+arch dungeon_magic
 x 50
 y 3
 end
-arch dungeon_magic
+arch brush
 x 50
 y 3
 end
@@ -16292,6 +16826,10 @@ arch cwall_1_2
 x 50
 y 12
 end
+arch dungeon_magic
+x 50
+y 13
+end
 arch greenmarble
 x 50
 y 13
@@ -16302,7 +16840,7 @@ y 13
 end
 arch dungeon_magic
 x 50
-y 13
+y 14
 end
 arch greenmarble
 x 50
@@ -16312,10 +16850,6 @@ arch swall_1_2
 x 50
 y 14
 end
-arch dungeon_magic
-x 50
-y 14
-end
 arch greenmarble
 x 50
 y 15
@@ -16372,6 +16906,10 @@ arch cwall_1_2
 x 50
 y 21
 end
+arch dungeon_magic
+x 50
+y 22
+end
 arch greenmarble
 x 50
 y 22
@@ -16381,10 +16919,6 @@ face swall_55.111
 x 50
 y 22
 end
-arch dungeon_magic
-x 50
-y 22
-end
 arch greenmarble
 x 50
 y 23
@@ -16393,6 +16927,10 @@ arch cwall_1_3
 x 50
 y 23
 end
+arch dungeon_magic
+x 50
+y 24
+end
 arch greenmarble
 x 50
 y 24
@@ -16402,10 +16940,6 @@ face swall_55.111
 x 50
 y 24
 end
-arch dungeon_magic
-x 50
-y 24
-end
 arch greenmarble
 x 50
 y 25
@@ -16430,6 +16964,10 @@ arch cwall_1_2
 x 50
 y 27
 end
+arch dungeon_magic
+x 50
+y 28
+end
 arch greenmarble
 x 50
 y 28
@@ -16440,7 +16978,7 @@ y 28
 end
 arch dungeon_magic
 x 50
-y 28
+y 29
 end
 arch greenmarble
 x 50
@@ -16452,7 +16990,7 @@ y 29
 end
 arch dungeon_magic
 x 50
-y 29
+y 30
 end
 arch greenmarble
 x 50
@@ -16462,10 +17000,6 @@ arch swall_1_2
 x 50
 y 30
 end
-arch dungeon_magic
-x 50
-y 30
-end
 arch greenmarble
 x 50
 y 31
@@ -16490,6 +17024,10 @@ arch cwall_1_2
 x 50
 y 33
 end
+arch dungeon_magic
+x 50
+y 34
+end
 arch greenmarble
 x 50
 y 34
@@ -16499,10 +17037,6 @@ face swall_55.111
 x 50
 y 34
 end
-arch dungeon_magic
-x 50
-y 34
-end
 arch greenmarble
 x 50
 y 35
@@ -16559,6 +17093,10 @@ arch cwall_1_2
 x 50
 y 41
 end
+arch dungeon_magic
+x 50
+y 42
+end
 arch greenmarble
 x 50
 y 42
@@ -16569,7 +17107,7 @@ y 42
 end
 arch dungeon_magic
 x 50
-y 42
+y 43
 end
 arch greenmarble
 x 50
@@ -16579,10 +17117,6 @@ arch swall_1_2
 x 50
 y 43
 end
-arch dungeon_magic
-x 50
-y 43
-end
 arch greenmarble
 x 50
 y 44
@@ -16663,11 +17197,11 @@ name moat
 x 50
 y 54
 end
-arch brush
+arch dungeon_magic
 x 50
 y 55
 end
-arch dungeon_magic
+arch brush
 x 50
 y 55
 end
@@ -16704,11 +17238,11 @@ arch brush
 x 51
 y 2
 end
-arch brush
+arch dungeon_magic
 x 51
 y 3
 end
-arch dungeon_magic
+arch brush
 x 51
 y 3
 end
@@ -17102,11 +17636,11 @@ name moat
 x 51
 y 54
 end
-arch brush
+arch dungeon_magic
 x 51
 y 55
 end
-arch dungeon_magic
+arch brush
 x 51
 y 55
 end
@@ -17143,11 +17677,11 @@ arch brush
 x 52
 y 2
 end
-arch brush
+arch dungeon_magic
 x 52
 y 3
 end
-arch dungeon_magic
+arch brush
 x 52
 y 3
 end
@@ -17406,11 +17940,11 @@ name moat
 x 52
 y 54
 end
-arch brush
+arch dungeon_magic
 x 52
 y 55
 end
-arch dungeon_magic
+arch brush
 x 52
 y 55
 end
@@ -17447,11 +17981,11 @@ arch brush
 x 53
 y 2
 end
-arch brush
+arch dungeon_magic
 x 53
 y 3
 end
-arch dungeon_magic
+arch brush
 x 53
 y 3
 end
@@ -17710,11 +18244,11 @@ name moat
 x 53
 y 54
 end
-arch brush
+arch dungeon_magic
 x 53
 y 55
 end
-arch dungeon_magic
+arch brush
 x 53
 y 55
 end
@@ -17751,11 +18285,11 @@ arch brush
 x 54
 y 2
 end
-arch brush
+arch dungeon_magic
 x 54
 y 3
 end
-arch dungeon_magic
+arch brush
 x 54
 y 3
 end
@@ -18014,11 +18548,11 @@ name moat
 x 54
 y 54
 end
-arch brush
+arch dungeon_magic
 x 54
 y 55
 end
-arch dungeon_magic
+arch brush
 x 54
 y 55
 end
@@ -18055,17 +18589,13 @@ arch brush
 x 55
 y 2
 end
-arch brush
-x 55
-y 3
-end
 arch dungeon_magic
 x 55
 y 3
 end
 arch brush
 x 55
-y 4
+y 3
 end
 arch dungeon_magic
 x 55
@@ -18073,7 +18603,7 @@ y 4
 end
 arch brush
 x 55
-y 5
+y 4
 end
 arch dungeon_magic
 x 55
@@ -18081,7 +18611,7 @@ y 5
 end
 arch brush
 x 55
-y 6
+y 5
 end
 arch dungeon_magic
 x 55
@@ -18089,6 +18619,14 @@ y 6
 end
 arch brush
 x 55
+y 6
+end
+arch dungeon_magic
+x 55
+y 7
+end
+arch brush
+x 55
 y 7
 end
 arch lamppost
@@ -18100,7 +18638,7 @@ move_block all
 end
 arch dungeon_magic
 x 55
-y 7
+y 8
 end
 arch brush
 x 55
@@ -18108,7 +18646,7 @@ y 8
 end
 arch dungeon_magic
 x 55
-y 8
+y 9
 end
 arch brush
 x 55
@@ -18116,7 +18654,7 @@ y 9
 end
 arch dungeon_magic
 x 55
-y 9
+y 10
 end
 arch brush
 x 55
@@ -18124,7 +18662,7 @@ y 10
 end
 arch dungeon_magic
 x 55
-y 10
+y 11
 end
 arch brush
 x 55
@@ -18132,7 +18670,7 @@ y 11
 end
 arch dungeon_magic
 x 55
-y 11
+y 12
 end
 arch brush
 x 55
@@ -18140,7 +18678,7 @@ y 12
 end
 arch dungeon_magic
 x 55
-y 12
+y 13
 end
 arch brush
 x 55
@@ -18148,7 +18686,7 @@ y 13
 end
 arch dungeon_magic
 x 55
-y 13
+y 14
 end
 arch brush
 x 55
@@ -18156,7 +18694,7 @@ y 14
 end
 arch dungeon_magic
 x 55
-y 14
+y 15
 end
 arch brush
 x 55
@@ -18164,7 +18702,7 @@ y 15
 end
 arch dungeon_magic
 x 55
-y 15
+y 16
 end
 arch brush
 x 55
@@ -18172,7 +18710,7 @@ y 16
 end
 arch dungeon_magic
 x 55
-y 16
+y 17
 end
 arch brush
 x 55
@@ -18180,7 +18718,7 @@ y 17
 end
 arch dungeon_magic
 x 55
-y 17
+y 18
 end
 arch brush
 x 55
@@ -18188,7 +18726,7 @@ y 18
 end
 arch dungeon_magic
 x 55
-y 18
+y 19
 end
 arch brush
 x 55
@@ -18196,7 +18734,7 @@ y 19
 end
 arch dungeon_magic
 x 55
-y 19
+y 20
 end
 arch brush
 x 55
@@ -18204,7 +18742,7 @@ y 20
 end
 arch dungeon_magic
 x 55
-y 20
+y 21
 end
 arch brush
 x 55
@@ -18212,7 +18750,7 @@ y 21
 end
 arch dungeon_magic
 x 55
-y 21
+y 22
 end
 arch brush
 x 55
@@ -18220,7 +18758,7 @@ y 22
 end
 arch dungeon_magic
 x 55
-y 22
+y 23
 end
 arch brush
 x 55
@@ -18228,7 +18766,7 @@ y 23
 end
 arch dungeon_magic
 x 55
-y 23
+y 24
 end
 arch brush
 x 55
@@ -18236,7 +18774,7 @@ y 24
 end
 arch dungeon_magic
 x 55
-y 24
+y 25
 end
 arch brush
 x 55
@@ -18244,7 +18782,7 @@ y 25
 end
 arch dungeon_magic
 x 55
-y 25
+y 26
 end
 arch brush
 x 55
@@ -18252,7 +18790,7 @@ y 26
 end
 arch dungeon_magic
 x 55
-y 26
+y 27
 end
 arch brush
 x 55
@@ -18260,7 +18798,7 @@ y 27
 end
 arch dungeon_magic
 x 55
-y 27
+y 28
 end
 arch brush
 x 55
@@ -18268,7 +18806,7 @@ y 28
 end
 arch dungeon_magic
 x 55
-y 28
+y 29
 end
 arch brush
 x 55
@@ -18276,7 +18814,7 @@ y 29
 end
 arch dungeon_magic
 x 55
-y 29
+y 30
 end
 arch brush
 x 55
@@ -18284,7 +18822,7 @@ y 30
 end
 arch dungeon_magic
 x 55
-y 30
+y 31
 end
 arch brush
 x 55
@@ -18292,7 +18830,7 @@ y 31
 end
 arch dungeon_magic
 x 55
-y 31
+y 32
 end
 arch brush
 x 55
@@ -18300,7 +18838,7 @@ y 32
 end
 arch dungeon_magic
 x 55
-y 32
+y 33
 end
 arch brush
 x 55
@@ -18308,7 +18846,7 @@ y 33
 end
 arch dungeon_magic
 x 55
-y 33
+y 34
 end
 arch brush
 x 55
@@ -18316,7 +18854,7 @@ y 34
 end
 arch dungeon_magic
 x 55
-y 34
+y 35
 end
 arch brush
 x 55
@@ -18324,7 +18862,7 @@ y 35
 end
 arch dungeon_magic
 x 55
-y 35
+y 36
 end
 arch brush
 x 55
@@ -18332,7 +18870,7 @@ y 36
 end
 arch dungeon_magic
 x 55
-y 36
+y 37
 end
 arch brush
 x 55
@@ -18340,7 +18878,7 @@ y 37
 end
 arch dungeon_magic
 x 55
-y 37
+y 38
 end
 arch brush
 x 55
@@ -18348,7 +18886,7 @@ y 38
 end
 arch dungeon_magic
 x 55
-y 38
+y 39
 end
 arch brush
 x 55
@@ -18356,7 +18894,7 @@ y 39
 end
 arch dungeon_magic
 x 55
-y 39
+y 40
 end
 arch brush
 x 55
@@ -18364,7 +18902,7 @@ y 40
 end
 arch dungeon_magic
 x 55
-y 40
+y 41
 end
 arch brush
 x 55
@@ -18372,7 +18910,7 @@ y 41
 end
 arch dungeon_magic
 x 55
-y 41
+y 42
 end
 arch brush
 x 55
@@ -18380,7 +18918,7 @@ y 42
 end
 arch dungeon_magic
 x 55
-y 42
+y 43
 end
 arch brush
 x 55
@@ -18388,7 +18926,7 @@ y 43
 end
 arch dungeon_magic
 x 55
-y 43
+y 44
 end
 arch brush
 x 55
@@ -18396,7 +18934,7 @@ y 44
 end
 arch dungeon_magic
 x 55
-y 44
+y 45
 end
 arch brush
 x 55
@@ -18404,7 +18942,7 @@ y 45
 end
 arch dungeon_magic
 x 55
-y 45
+y 46
 end
 arch brush
 x 55
@@ -18412,7 +18950,7 @@ y 46
 end
 arch dungeon_magic
 x 55
-y 46
+y 47
 end
 arch brush
 x 55
@@ -18420,7 +18958,7 @@ y 47
 end
 arch dungeon_magic
 x 55
-y 47
+y 48
 end
 arch brush
 x 55
@@ -18428,7 +18966,7 @@ y 48
 end
 arch dungeon_magic
 x 55
-y 48
+y 49
 end
 arch brush
 x 55
@@ -18436,7 +18974,7 @@ y 49
 end
 arch dungeon_magic
 x 55
-y 49
+y 50
 end
 arch brush
 x 55
@@ -18444,7 +18982,7 @@ y 50
 end
 arch dungeon_magic
 x 55
-y 50
+y 51
 end
 arch brush
 x 55
@@ -18452,7 +18990,7 @@ y 51
 end
 arch dungeon_magic
 x 55
-y 51
+y 52
 end
 arch brush
 x 55
@@ -18460,7 +18998,7 @@ y 52
 end
 arch dungeon_magic
 x 55
-y 52
+y 53
 end
 arch brush
 x 55
@@ -18468,7 +19006,7 @@ y 53
 end
 arch dungeon_magic
 x 55
-y 53
+y 54
 end
 arch brush
 x 55
@@ -18476,13 +19014,9 @@ y 54
 end
 arch dungeon_magic
 x 55
-y 54
-end
-arch brush
-x 55
 y 55
 end
-arch dungeon_magic
+arch brush
 x 55
 y 55
 end
@@ -19243,537 +19777,3 @@ arch brush
 x 58
 y 58
 end
-arch big_wiz
-name Pyromancy Scroll Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 13
-y 15
-level 108
-attacktype 86180
-resist_physical 65
-resist_fire 100
-resist_electricity 65
-resist_cold 65
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 2
-run_away 0
-arch rod_light
-hp 500
-maxhp 500
-sp 90
-level 110
-startequip 1
-end
-arch scroll_new
-sp 3
-nrof 10
-level 110
-end
-arch scroll_new
-sp 6
-nrof 10
-level 110
-end
-arch scroll_new
-sp 57
-nrof 10
-level 110
-end
-arch key2
-name pyromancy scroll key
-name_pl pyromancy scroll keys
-slaying pyromancy_scroll_key
-end
-arch stylus
-end
-end
-arch big_wiz
-name Summoning Scroll Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 13
-y 42
-level 108
-attacktype 87169
-resist_physical 65
-resist_fire 65
-resist_electricity 65
-resist_cold 65
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 64
-arch rod_light
-hp 500
-maxhp 500
-sp 128
-level 110
-end
-arch scroll_new
-sp 91
-nrof 10
-level 110
-end
-arch scroll_new
-sp 65
-nrof 10
-level 110
-end
-arch scroll_new
-other_arch devil
-sp 9
-nrof 10
-level 110
-end
-arch key2
-name summoning scroll key
-name_pl summoning scroll keys
-slaying summoning_scroll_key
-end
-arch spell_magehound
-end
-arch stylus
-end
-end
-arch big_wiz
-name Pyromancy Book Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 17
-y 15
-level 108
-attacktype 86180
-resist_physical 65
-resist_fire 100
-resist_electricity 65
-resist_cold 65
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 2
-run_away 0
-arch rod_light
-hp 500
-maxhp 500
-sp 90
-level 110
-startequip 1
-end
-arch pyro_book
-end
-arch pyro_book_l1
-end
-arch pyro_book_l1
-end
-arch key2
-name pyromancy book key
-name_pl pyromancy book keys
-slaying pyromancy_book_key
-end
-arch stylus
-end
-end
-arch big_wiz
-name Summoning Book Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 17
-y 42
-level 108
-attacktype 87169
-resist_physical 65
-resist_fire 65
-resist_electricity 65
-resist_cold 65
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 64
-arch rod_light
-hp 500
-maxhp 500
-sp 123
-level 110
-end
-arch summoner_book
-value 200
-randomitems none
-arch spell_magehound
-end
-end
-arch summoner_book_l1
-end
-arch summoner_book_l1
-end
-arch key2
-name summoning book key
-name_pl summoning book keys
-slaying summoning_book_key
-end
-arch spell_magehound
-end
-arch stylus
-end
-end
-arch Cwyvern
-name Zorn wyvern of chaos
-title Guardian of the Treasure
-Con 50
-Wis 20
-Pow 50
-exp 2000000
-wc -75
-ac -75
-x 25
-y 12
-level 109
-attacktype 262429
-resist_magic 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_poison -25
-resist_slow 50
-resist_fear 100
-resist_deplete 50
-resist_chaos 50
-resist_godpower 20
-resist_holyword 50
-run_away 0
-end
-arch big_chaos_dragon
-name Zorn dragon of chaos
-title Guardian of the Treasure
-Con 75
-Wis 20
-Pow 20
-sp 0
-maxsp 250
-exp 4500000
-dam 50
-wc -95
-ac -95
-x 28
-y 13
-level 110
-attacktype 262429
-resist_magic 75
-resist_confusion 75
-resist_acid 75
-resist_drain 75
-resist_weaponmagic 25
-resist_poison -25
-resist_slow 75
-resist_fear 100
-resist_deplete 75
-resist_chaos 75
-resist_godpower 20
-resist_holyword 75
-path_attuned 14
-run_away 0
-end
-arch Cwyvern
-name Zorn wyvern of chaos
-title Guardian of the Treasure
-Con 50
-Wis 20
-Pow 50
-exp 2000000
-wc -75
-ac -75
-x 32
-y 12
-level 109
-attacktype 262429
-resist_magic 50
-resist_confusion 50
-resist_acid 50
-resist_drain 50
-resist_weaponmagic 50
-resist_poison -25
-resist_slow 50
-resist_fear 100
-resist_deplete 50
-resist_chaos 50
-resist_godpower 20
-resist_holyword 50
-run_away 0
-end
-arch big_wiz
-name Evocation Scroll Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 40
-y 13
-level 108
-attacktype 86192
-resist_physical 65
-resist_fire 65
-resist_electricity 65
-resist_cold 100
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 4
-run_away 0
-arch rod_light
-hp 500
-maxhp 500
-sp 88
-level 110
-startequip 1
-end
-arch scroll_new
-sp 180
-nrof 10
-level 110
-end
-arch scroll_new
-sp 17
-nrof 10
-level 110
-end
-arch scroll_new
-sp 113
-nrof 10
-level 110
-end
-arch key2
-name evocation scroll key
-name_pl evocation scroll keys
-slaying evocation_scroll_key
-end
-arch stylus
-end
-end
-arch big_wiz
-name Sorcery Scroll Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 40
-y 43
-level 108
-attacktype 87200
-resist_physical 65
-resist_fire 65
-resist_electricity 65
-resist_cold 65
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 16
-run_away 0
-arch scroll_new
-sp 64
-nrof 10
-level 110
-end
-arch scroll_new
-sp 23
-nrof 10
-level 110
-end
-arch scroll_new
-sp 63
-nrof 10
-level 110
-end
-arch key2
-name sorcery scroll key
-name_pl sorcery scroll keys
-slaying sorcery_scroll_key
-end
-arch rod_light
-hp 500
-maxhp 500
-sp 85
-level 110
-startequip 1
-end
-arch stylus
-end
-end
-arch big_wiz
-name Evocation Book Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 44
-y 13
-level 108
-attacktype 86192
-resist_physical 65
-resist_fire 65
-resist_electricity 65
-resist_cold 100
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 4
-run_away 0
-arch evoker_book
-end
-arch evoker_book_l1
-end
-arch evoker_book_l1
-end
-arch key2
-name evocation book key
-name_pl evocation book keys
-slaying evocation_book_key
-end
-arch rod_light
-hp 500
-maxhp 500
-sp 88
-level 110
-startequip 1
-end
-arch stylus
-end
-end
-arch big_wiz
-name Sorcery Book Writer
-title of Zorn
-Con 35
-Pow 50
-hp 5000
-maxhp 5000
-sp 250
-maxsp 250
-exp 1000000
-wc -30
-ac -25
-x 44
-y 43
-level 108
-attacktype 87200
-resist_physical 65
-resist_fire 65
-resist_electricity 65
-resist_cold 65
-resist_confusion 65
-resist_acid 65
-resist_drain 65
-resist_weaponmagic 65
-resist_slow -25
-resist_deplete 65
-resist_death 65
-resist_chaos 65
-path_attuned 16
-run_away 0
-arch sorcerer_book
-end
-arch sorcerer_book_l1
-end
-arch sorcerer_book_l1
-end
-arch key2
-name sorcery book key
-name_pl sorcery book keys
-slaying sorcery_book_key
-end
-arch rod_light
-hp 500
-maxhp 500
-sp 85
-level 110
-startequip 1
-end
-arch stylus
-end
-end
diff --git a/brest/zorn/castle.upper.floor.two b/brest/zorn/castle.upper.floor.two
index de9015e70..afdbf099d 100644
--- a/brest/zorn/castle.upper.floor.two
+++ b/brest/zorn/castle.upper.floor.two
@@ -698,11 +698,11 @@ arch brush
 x 3
 y 2
 end
-arch brush
+arch dungeon_magic
 x 3
 y 3
 end
-arch dungeon_magic
+arch brush
 x 3
 y 3
 end
@@ -1162,11 +1162,11 @@ arch brush
 x 4
 y 2
 end
-arch brush
+arch dungeon_magic
 x 4
 y 3
 end
-arch dungeon_magic
+arch brush
 x 4
 y 3
 end
@@ -22958,11 +22958,11 @@ arch brush
 x 55
 y 2
 end
-arch brush
+arch dungeon_magic
 x 55
 y 3
 end
-arch dungeon_magic
+arch brush
 x 55
 y 3
 end