From 439a54bc393337ce292303ce1ee28480612e5310 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 24 Jun 2014 06:28:35 +0000
Subject: [PATCH] Part of Patch #342. Cosmetic updates and standardized exits
 from Warehouse #5 (navar_city/warehouse5) in Navar and related world map
 (world/world_122_116) update.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@19580 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/warehouse5 | 1719 ++++++++++++++++++++++++++---------------
 world/world_122_116   |    4 +-
 2 files changed, 1084 insertions(+), 639 deletions(-)

diff --git a/navar_city/warehouse5 b/navar_city/warehouse5
index 2961c9018..0bf381866 100644
--- a/navar_city/warehouse5
+++ b/navar_city/warehouse5
@@ -2,590 +2,644 @@ arch map
 name Warehouse #5
 difficulty 17
 region navar
-width 25
-height 21
+width 27
+height 23
 enter_x 24
 enter_y 9
 msg
 Created:  1993-11-15
-Modified: 2011-11-22 Rick Tanner
+Modified: 2014-06-16 jwright
 endmsg
+outdoor 1
+end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
+y 17
+end
+arch cobblestones2
+y 18
+end
+arch cobblestones2
+y 19
+end
+arch cobblestones2
+y 20
+end
+arch cobblestones2
+y 21
+end
+arch cobblestones2
+y 22
+end
+arch cobblestones2
+x 1
 end
 arch woodfloor
+x 1
+y 1
 end
 arch wwall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch wwall_2_1_1
+x 1
 y 1
 end
 arch woodfloor
+x 1
 y 2
 end
 arch wwall_2_1_1
+x 1
 y 2
 end
 arch woodfloor
+x 1
 y 3
 end
 arch wwall_2_1_1
+x 1
 y 3
 end
 arch woodfloor
+x 1
 y 4
 end
 arch wwall_2_1_1
+x 1
 y 4
 end
 arch woodfloor
+x 1
 y 5
 end
 arch wwall_2_1_1
+x 1
 y 5
 end
 arch woodfloor
+x 1
 y 6
 end
 arch wwall_2_1_1
+x 1
 y 6
 end
 arch woodfloor
+x 1
 y 7
 end
 arch wwall_2_1_1
+x 1
 y 7
 end
 arch woodfloor
+x 1
 y 8
 end
 arch wwall_2_1_1
+x 1
 y 8
 end
 arch woodfloor
+x 1
 y 9
 end
 arch wwall_2_1_1
+x 1
 y 9
 end
 arch woodfloor
+x 1
 y 10
 end
 arch wwall_2_1_1
+x 1
 y 10
 end
 arch woodfloor
+x 1
 y 11
 end
 arch wwall_2_1_1
+x 1
 y 11
 end
 arch woodfloor
+x 1
 y 12
 end
 arch wwall_2_1_1
+x 1
 y 12
 end
 arch woodfloor
+x 1
 y 13
 end
 arch wwall_2_1_1
+x 1
 y 13
 end
 arch woodfloor
+x 1
 y 14
 end
 arch wwall_2_1_1
+x 1
 y 14
 end
 arch woodfloor
+x 1
 y 15
 end
 arch wwall_2_1_1
+x 1
 y 15
 end
 arch woodfloor
+x 1
 y 16
 end
 arch wwall_2_1_1
+x 1
 y 16
 end
 arch woodfloor
+x 1
 y 17
 end
 arch wwall_2_1_1
+x 1
 y 17
 end
 arch woodfloor
+x 1
 y 18
 end
 arch wwall_2_1_1
+x 1
 y 18
 end
 arch woodfloor
+x 1
 y 19
 end
 arch wwall_2_1_1
+x 1
 y 19
 end
 arch woodfloor
+x 1
 y 20
 end
+arch wwall_2_1_1
+x 1
+y 20
+end
+arch woodfloor
+x 1
+y 21
+end
 arch wwall_2_2_1
-y 20
+x 1
+y 21
+end
+arch cobblestones2
+x 1
+y 22
+end
+arch cobblestones2
+x 2
 end
 arch woodfloor
-x 1
+x 2
+y 1
 end
 arch wwall_2_1_2
-x 1
-end
-arch woodfloor
-x 1
-y 1
-end
-arch chest
-x 1
+x 2
 y 1
 end
 arch woodfloor
-x 1
+x 2
 y 2
 end
-arch random_wealth
-x 1
+arch chest
+x 2
 y 2
 end
 arch woodfloor
-x 1
+x 2
 y 3
 end
-arch chest
-x 1
-y 3
-end
-arch woodfloor
-x 1
-y 4
-end
-arch chest
-x 1
-y 4
-end
-arch woodfloor
-x 1
-y 5
-end
-arch chest
-x 1
-y 5
-end
-arch woodfloor
-x 1
-y 6
-end
 arch random_wealth
-x 1
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 4
+end
+arch chest
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
+end
+arch chest
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch chest
+x 2
 y 6
 end
 arch woodfloor
-x 1
+x 2
 y 7
 end
+arch random_wealth
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
 arch random_treasure
-x 1
-y 7
-end
-arch woodfloor
-x 1
+x 2
 y 8
 end
 arch woodfloor
-x 1
+x 2
 y 9
 end
 arch woodfloor
-x 1
+x 2
 y 10
 end
 arch woodfloor
-x 1
+x 2
 y 11
 end
 arch woodfloor
-x 1
+x 2
 y 12
 end
 arch woodfloor
-x 1
+x 2
 y 13
 end
 arch woodfloor
-x 1
+x 2
 y 14
 end
 arch woodfloor
-x 1
+x 2
 y 15
 end
 arch woodfloor
-x 1
+x 2
 y 16
 end
 arch woodfloor
-x 1
+x 2
 y 17
 end
 arch woodfloor
-x 1
+x 2
 y 18
 end
 arch woodfloor
-x 1
+x 2
 y 19
 end
+arch woodfloor
+x 2
+y 20
+end
 arch random_food
-x 1
-y 19
-end
-arch woodfloor
-x 1
-y 20
-end
-arch wwall_2_1_2
-x 1
+x 2
 y 20
 end
 arch woodfloor
 x 2
+y 21
 end
 arch wwall_2_1_2
 x 2
+y 21
+end
+arch cobblestones2
+x 2
+y 22
+end
+arch cobblestones2
+x 3
 end
 arch woodfloor
-x 2
+x 3
 y 1
 end
-arch chest
-x 2
+arch wwall_2_1_2
+x 3
 y 1
 end
 arch woodfloor
-x 2
+x 3
 y 2
 end
 arch chest
-x 2
+x 3
 y 2
 end
 arch woodfloor
-x 2
+x 3
+y 3
+end
+arch chest
+x 3
 y 3
 end
 arch woodfloor
-x 2
+x 3
 y 4
 end
 arch woodfloor
-x 2
+x 3
 y 5
 end
 arch woodfloor
-x 2
+x 3
 y 6
 end
 arch woodfloor
-x 2
+x 3
 y 7
 end
 arch woodfloor
-x 2
+x 3
 y 8
 end
 arch woodfloor
-x 2
+x 3
 y 9
 end
 arch woodfloor
-x 2
+x 3
 y 10
 end
 arch woodfloor
-x 2
+x 3
 y 11
 end
 arch woodfloor
-x 2
+x 3
 y 12
 end
 arch woodfloor
-x 2
+x 3
 y 13
 end
 arch woodfloor
-x 2
+x 3
 y 14
 end
 arch woodfloor
-x 2
+x 3
 y 15
 end
 arch woodfloor
-x 2
+x 3
 y 16
 end
 arch woodfloor
-x 2
+x 3
 y 17
 end
 arch woodfloor
-x 2
+x 3
 y 18
 end
 arch woodfloor
-x 2
+x 3
 y 19
 end
 arch woodfloor
-x 2
-y 20
-end
-arch wwall_2_1_2
-x 2
+x 3
 y 20
 end
 arch woodfloor
 x 3
+y 21
 end
 arch wwall_2_1_2
 x 3
+y 21
+end
+arch cobblestones2
+x 3
+y 22
+end
+arch cobblestones2
+x 4
 end
 arch woodfloor
-x 3
+x 4
 y 1
 end
+arch wwall_2_1_2
+x 4
+y 1
+end
+arch woodfloor
+x 4
+y 2
+end
 arch random_talisman
-x 3
-y 1
+x 4
+y 2
 end
 arch woodfloor
-x 3
-y 2
+x 4
+y 3
 end
 arch chest
-x 3
-y 2
-end
-arch woodfloor
-x 3
+x 4
 y 3
 end
 arch woodfloor
-x 3
+x 4
 y 4
 end
 arch woodfloor
-x 3
+x 4
 y 5
 end
 arch woodfloor
-x 3
+x 4
 y 6
 end
 arch woodfloor
-x 3
+x 4
 y 7
 end
 arch woodfloor
-x 3
+x 4
 y 8
 end
 arch woodfloor
-x 3
+x 4
 y 9
 end
 arch woodfloor
-x 3
+x 4
 y 10
 end
 arch woodfloor
-x 3
+x 4
 y 11
 end
 arch woodfloor
-x 3
+x 4
 y 12
 end
 arch woodfloor
-x 3
+x 4
 y 13
 end
 arch woodfloor
-x 3
+x 4
 y 14
 end
 arch woodfloor
-x 3
+x 4
 y 15
 end
 arch woodfloor
-x 3
+x 4
 y 16
 end
 arch woodfloor
-x 3
+x 4
 y 17
 end
+arch woodfloor
+x 4
+y 18
+end
 arch generate_dragon
-x 3
-y 17
-end
-arch woodfloor
-x 3
+x 4
 y 18
 end
 arch woodfloor
-x 3
+x 4
 y 19
 end
 arch woodfloor
-x 3
-y 20
-end
-arch wwall_2_1_2
-x 3
+x 4
 y 20
 end
 arch woodfloor
 x 4
+y 21
 end
 arch wwall_2_1_2
 x 4
+y 21
+end
+arch cobblestones2
+x 4
+y 22
+end
+arch cobblestones2
+x 5
 end
 arch woodfloor
-x 4
+x 5
+y 1
+end
+arch wwall_2_1_2
+x 5
 y 1
 end
 arch woodfloor
-x 4
+x 5
 y 2
 end
 arch woodfloor
-x 4
+x 5
 y 3
 end
 arch woodfloor
-x 4
+x 5
 y 4
 end
 arch woodfloor
-x 4
+x 5
 y 5
 end
 arch woodfloor
-x 4
-y 6
-end
-arch dragon
-x 4
+x 5
 y 6
 end
 arch woodfloor
-x 4
+x 5
 y 7
 end
-arch woodfloor
-x 4
-y 8
-end
-arch woodfloor
-x 4
-y 9
-end
-arch woodfloor
-x 4
-y 10
-end
-arch woodfloor
-x 4
-y 11
-end
-arch woodfloor
-x 4
-y 12
-end
-arch woodfloor
-x 4
-y 13
-end
 arch dragon
-x 4
-y 13
-end
-arch woodfloor
-x 4
-y 14
-end
-arch woodfloor
-x 4
-y 15
-end
-arch woodfloor
-x 4
-y 16
-end
-arch woodfloor
-x 4
-y 17
-end
-arch woodfloor
-x 4
-y 18
-end
-arch woodfloor
-x 4
-y 19
-end
-arch woodfloor
-x 4
-y 20
-end
-arch wwall_2_1_2
-x 4
-y 20
-end
-arch woodfloor
-x 5
-end
-arch wwall_2_1_2
-x 5
-end
-arch woodfloor
-x 5
-y 1
-end
-arch woodfloor
-x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch woodfloor
-x 5
-y 4
-end
-arch woodfloor
-x 5
-y 5
-end
-arch woodfloor
-x 5
-y 6
-end
-arch woodfloor
 x 5
 y 7
 end
@@ -617,6 +671,10 @@ arch woodfloor
 x 5
 y 14
 end
+arch dragon
+x 5
+y 14
+end
 arch woodfloor
 x 5
 y 15
@@ -641,18 +699,27 @@ arch woodfloor
 x 5
 y 20
 end
+arch woodfloor
+x 5
+y 21
+end
 arch wwall_2_1_2
 x 5
-y 20
+y 21
+end
+arch cobblestones2
+x 5
+y 22
+end
+arch cobblestones2
+x 6
 end
 arch woodfloor
 x 6
+y 1
 end
 arch wwall_2_1_2
 x 6
-end
-arch woodfloor
-x 6
 y 1
 end
 arch woodfloor
@@ -663,10 +730,6 @@ arch woodfloor
 x 6
 y 3
 end
-arch dragon
-x 6
-y 3
-end
 arch woodfloor
 x 6
 y 4
@@ -687,10 +750,6 @@ arch woodfloor
 x 6
 y 8
 end
-arch dragon
-x 6
-y 8
-end
 arch woodfloor
 x 6
 y 9
@@ -739,18 +798,27 @@ arch woodfloor
 x 6
 y 20
 end
+arch woodfloor
+x 6
+y 21
+end
 arch wwall_2_1_2
 x 6
-y 20
+y 21
+end
+arch cobblestones2
+x 6
+y 22
+end
+arch cobblestones2
+x 7
 end
 arch woodfloor
 x 7
+y 1
 end
 arch wwall_2_1_2
 x 7
-end
-arch woodfloor
-x 7
 y 1
 end
 arch woodfloor
@@ -765,6 +833,10 @@ arch woodfloor
 x 7
 y 4
 end
+arch dragon
+x 7
+y 4
+end
 arch woodfloor
 x 7
 y 5
@@ -785,6 +857,10 @@ arch woodfloor
 x 7
 y 9
 end
+arch dragon
+x 7
+y 9
+end
 arch woodfloor
 x 7
 y 10
@@ -793,10 +869,6 @@ arch woodfloor
 x 7
 y 11
 end
-arch dragon
-x 7
-y 11
-end
 arch woodfloor
 x 7
 y 12
@@ -833,18 +905,27 @@ arch woodfloor
 x 7
 y 20
 end
+arch woodfloor
+x 7
+y 21
+end
 arch wwall_2_1_2
 x 7
-y 20
+y 21
+end
+arch cobblestones2
+x 7
+y 22
+end
+arch cobblestones2
+x 8
 end
 arch woodfloor
 x 8
+y 1
 end
 arch wwall_2_1_2
 x 8
-end
-arch woodfloor
-x 8
 y 1
 end
 arch woodfloor
@@ -891,6 +972,10 @@ arch woodfloor
 x 8
 y 12
 end
+arch dragon
+x 8
+y 12
+end
 arch woodfloor
 x 8
 y 13
@@ -923,18 +1008,27 @@ arch woodfloor
 x 8
 y 20
 end
+arch woodfloor
+x 8
+y 21
+end
 arch wwall_2_1_2
 x 8
-y 20
+y 21
+end
+arch cobblestones2
+x 8
+y 22
+end
+arch cobblestones2
+x 9
 end
 arch woodfloor
 x 9
+y 1
 end
 arch wwall_2_1_2
 x 9
-end
-arch woodfloor
-x 9
 y 1
 end
 arch woodfloor
@@ -945,10 +1039,6 @@ arch woodfloor
 x 9
 y 3
 end
-arch dragon
-x 9
-y 3
-end
 arch woodfloor
 x 9
 y 4
@@ -961,10 +1051,6 @@ arch woodfloor
 x 9
 y 6
 end
-arch dragon
-x 9
-y 6
-end
 arch woodfloor
 x 9
 y 7
@@ -1005,10 +1091,6 @@ arch woodfloor
 x 9
 y 16
 end
-arch dragon
-x 9
-y 16
-end
 arch woodfloor
 x 9
 y 17
@@ -1025,18 +1107,27 @@ arch woodfloor
 x 9
 y 20
 end
+arch woodfloor
+x 9
+y 21
+end
 arch wwall_2_1_2
 x 9
-y 20
+y 21
+end
+arch cobblestones2
+x 9
+y 22
+end
+arch cobblestones2
+x 10
 end
 arch woodfloor
 x 10
+y 1
 end
 arch wwall_2_1_2
 x 10
-end
-arch woodfloor
-x 10
 y 1
 end
 arch woodfloor
@@ -1051,6 +1142,10 @@ arch woodfloor
 x 10
 y 4
 end
+arch dragon
+x 10
+y 4
+end
 arch woodfloor
 x 10
 y 5
@@ -1063,6 +1158,10 @@ arch woodfloor
 x 10
 y 7
 end
+arch dragon
+x 10
+y 7
+end
 arch woodfloor
 x 10
 y 8
@@ -1103,6 +1202,10 @@ arch woodfloor
 x 10
 y 17
 end
+arch dragon
+x 10
+y 17
+end
 arch woodfloor
 x 10
 y 18
@@ -1115,20 +1218,29 @@ arch woodfloor
 x 10
 y 20
 end
+arch woodfloor
+x 10
+y 21
+end
 arch wwall_2_1_2
 x 10
-y 20
+y 21
 end
-arch woodfloor
-x 11
+arch cobblestones2
+x 10
+y 22
 end
-arch wwall_2_1_2
+arch cobblestones2
 x 11
 end
 arch woodfloor
 x 11
 y 1
 end
+arch wwall_2_1_2
+x 11
+y 1
+end
 arch woodfloor
 x 11
 y 2
@@ -1205,18 +1317,27 @@ arch woodfloor
 x 11
 y 20
 end
+arch woodfloor
+x 11
+y 21
+end
 arch wwall_2_1_2
 x 11
-y 20
+y 21
+end
+arch cobblestones2
+x 11
+y 22
+end
+arch cobblestones2
+x 12
 end
 arch woodfloor
 x 12
+y 1
 end
 arch wwall_2_1_2
 x 12
-end
-arch woodfloor
-x 12
 y 1
 end
 arch woodfloor
@@ -1255,10 +1376,6 @@ arch woodfloor
 x 12
 y 10
 end
-arch dragon
-x 12
-y 10
-end
 arch woodfloor
 x 12
 y 11
@@ -1299,25 +1416,30 @@ arch woodfloor
 x 12
 y 20
 end
+arch woodfloor
+x 12
+y 21
+end
 arch wwall_2_1_2
 x 12
-y 20
+y 21
 end
-arch woodfloor
-x 13
+arch cobblestones2
+x 12
+y 22
 end
-arch wwall_2_1_2
+arch cobblestones2
 x 13
 end
 arch woodfloor
 x 13
 y 1
 end
-arch woodfloor
+arch wwall_2_1_2
 x 13
-y 2
+y 1
 end
-arch dragon
+arch woodfloor
 x 13
 y 2
 end
@@ -1337,10 +1459,6 @@ arch woodfloor
 x 13
 y 6
 end
-arch dragon
-x 13
-y 6
-end
 arch woodfloor
 x 13
 y 7
@@ -1361,6 +1479,10 @@ arch woodfloor
 x 13
 y 11
 end
+arch dragon
+x 13
+y 11
+end
 arch woodfloor
 x 13
 y 12
@@ -1397,18 +1519,27 @@ arch woodfloor
 x 13
 y 20
 end
+arch woodfloor
+x 13
+y 21
+end
 arch wwall_2_1_2
 x 13
-y 20
+y 21
+end
+arch cobblestones2
+x 13
+y 22
+end
+arch cobblestones2
+x 14
 end
 arch woodfloor
 x 14
+y 1
 end
 arch wwall_2_1_2
 x 14
-end
-arch woodfloor
-x 14
 y 1
 end
 arch woodfloor
@@ -1419,6 +1550,10 @@ arch woodfloor
 x 14
 y 3
 end
+arch dragon
+x 14
+y 3
+end
 arch woodfloor
 x 14
 y 4
@@ -1435,6 +1570,10 @@ arch woodfloor
 x 14
 y 7
 end
+arch dragon
+x 14
+y 7
+end
 arch woodfloor
 x 14
 y 8
@@ -1487,20 +1626,29 @@ arch woodfloor
 x 14
 y 20
 end
+arch woodfloor
+x 14
+y 21
+end
 arch wwall_2_1_2
 x 14
-y 20
+y 21
 end
-arch woodfloor
-x 15
+arch cobblestones2
+x 14
+y 22
 end
-arch wwall_2_1_2
+arch cobblestones2
 x 15
 end
 arch woodfloor
 x 15
 y 1
 end
+arch wwall_2_1_2
+x 15
+y 1
+end
 arch woodfloor
 x 15
 y 2
@@ -1577,18 +1725,27 @@ arch woodfloor
 x 15
 y 20
 end
+arch woodfloor
+x 15
+y 21
+end
 arch wwall_2_1_2
 x 15
-y 20
+y 21
+end
+arch cobblestones2
+x 15
+y 22
+end
+arch cobblestones2
+x 16
 end
 arch woodfloor
 x 16
+y 1
 end
 arch wwall_2_1_2
 x 16
-end
-arch woodfloor
-x 16
 y 1
 end
 arch woodfloor
@@ -1639,10 +1796,6 @@ arch woodfloor
 x 16
 y 13
 end
-arch dragon
-x 16
-y 13
-end
 arch woodfloor
 x 16
 y 14
@@ -1671,25 +1824,30 @@ arch woodfloor
 x 16
 y 20
 end
+arch woodfloor
+x 16
+y 21
+end
 arch wwall_2_1_2
 x 16
-y 20
+y 21
 end
-arch woodfloor
-x 17
+arch cobblestones2
+x 16
+y 22
 end
-arch wwall_2_1_2
+arch cobblestones2
 x 17
 end
 arch woodfloor
 x 17
 y 1
 end
-arch woodfloor
+arch wwall_2_1_2
 x 17
-y 2
+y 1
 end
-arch dragon
+arch woodfloor
 x 17
 y 2
 end
@@ -1705,10 +1863,6 @@ arch woodfloor
 x 17
 y 5
 end
-arch dragon
-x 17
-y 5
-end
 arch woodfloor
 x 17
 y 6
@@ -1745,6 +1899,10 @@ arch woodfloor
 x 17
 y 14
 end
+arch dragon
+x 17
+y 14
+end
 arch woodfloor
 x 17
 y 15
@@ -1769,18 +1927,27 @@ arch woodfloor
 x 17
 y 20
 end
+arch woodfloor
+x 17
+y 21
+end
 arch wwall_2_1_2
 x 17
-y 20
+y 21
+end
+arch cobblestones2
+x 17
+y 22
+end
+arch cobblestones2
+x 18
 end
 arch woodfloor
 x 18
+y 1
 end
 arch wwall_2_1_2
 x 18
-end
-arch woodfloor
-x 18
 y 1
 end
 arch woodfloor
@@ -1791,6 +1958,10 @@ arch woodfloor
 x 18
 y 3
 end
+arch dragon
+x 18
+y 3
+end
 arch woodfloor
 x 18
 y 4
@@ -1803,6 +1974,10 @@ arch woodfloor
 x 18
 y 6
 end
+arch dragon
+x 18
+y 6
+end
 arch woodfloor
 x 18
 y 7
@@ -1815,10 +1990,6 @@ arch woodfloor
 x 18
 y 9
 end
-arch dragon
-x 18
-y 9
-end
 arch woodfloor
 x 18
 y 10
@@ -1851,10 +2022,6 @@ arch woodfloor
 x 18
 y 17
 end
-arch dragon
-x 18
-y 17
-end
 arch woodfloor
 x 18
 y 18
@@ -1867,18 +2034,27 @@ arch woodfloor
 x 18
 y 20
 end
+arch woodfloor
+x 18
+y 21
+end
 arch wwall_2_1_2
 x 18
-y 20
+y 21
+end
+arch cobblestones2
+x 18
+y 22
+end
+arch cobblestones2
+x 19
 end
 arch woodfloor
 x 19
+y 1
 end
 arch wwall_2_1_2
 x 19
-end
-arch woodfloor
-x 19
 y 1
 end
 arch woodfloor
@@ -1917,6 +2093,10 @@ arch woodfloor
 x 19
 y 10
 end
+arch dragon
+x 19
+y 10
+end
 arch woodfloor
 x 19
 y 11
@@ -1949,6 +2129,10 @@ arch woodfloor
 x 19
 y 18
 end
+arch dragon
+x 19
+y 18
+end
 arch woodfloor
 x 19
 y 19
@@ -1957,20 +2141,29 @@ arch woodfloor
 x 19
 y 20
 end
+arch woodfloor
+x 19
+y 21
+end
 arch wwall_2_1_2
 x 19
-y 20
+y 21
 end
-arch woodfloor
-x 20
+arch cobblestones2
+x 19
+y 22
 end
-arch wwall_2_1_2
+arch cobblestones2
 x 20
 end
 arch woodfloor
 x 20
 y 1
 end
+arch wwall_2_1_2
+x 20
+y 1
+end
 arch woodfloor
 x 20
 y 2
@@ -1995,622 +2188,874 @@ arch woodfloor
 x 20
 y 7
 end
+arch woodfloor
+x 20
+y 8
+end
+arch woodfloor
+x 20
+y 9
+end
+arch woodfloor
+x 20
+y 10
+end
+arch woodfloor
+x 20
+y 11
+end
+arch woodfloor
+x 20
+y 12
+end
+arch woodfloor
+x 20
+y 13
+end
+arch woodfloor
+x 20
+y 14
+end
+arch woodfloor
+x 20
+y 15
+end
+arch woodfloor
+x 20
+y 16
+end
+arch woodfloor
+x 20
+y 17
+end
+arch woodfloor
+x 20
+y 18
+end
+arch woodfloor
+x 20
+y 19
+end
+arch woodfloor
+x 20
+y 20
+end
+arch woodfloor
+x 20
+y 21
+end
+arch wwall_2_1_2
+x 20
+y 21
+end
+arch cobblestones2
+x 20
+y 22
+end
+arch cobblestones2
+x 21
+end
+arch woodfloor
+x 21
+y 1
+end
+arch wwall_2_1_2
+x 21
+y 1
+end
+arch woodfloor
+x 21
+y 2
+end
+arch woodfloor
+x 21
+y 3
+end
+arch woodfloor
+x 21
+y 4
+end
+arch woodfloor
+x 21
+y 5
+end
+arch woodfloor
+x 21
+y 6
+end
+arch woodfloor
+x 21
+y 7
+end
+arch woodfloor
+x 21
+y 8
+end
 arch wwall_1_4
-x 20
-y 7
+x 21
+y 8
 end
 arch woodfloor
-x 20
-y 8
-end
-arch dungeon_magic
-x 20
-y 8
-end
-arch grate_closed_2
-x 20
-y 8
-connected 10
-end
-arch woodfloor
-x 20
+x 21
 y 9
 end
 arch dungeon_magic
-x 20
+x 21
 y 9
 end
 arch grate_closed_2
-x 20
+x 21
 y 9
 connected 10
 end
 arch woodfloor
-x 20
+x 21
 y 10
 end
 arch dungeon_magic
-x 20
+x 21
 y 10
 end
 arch grate_closed_2
-x 20
+x 21
 y 10
 connected 10
 end
 arch woodfloor
-x 20
+x 21
 y 11
 end
+arch dungeon_magic
+x 21
+y 11
+end
+arch grate_closed_2
+x 21
+y 11
+connected 10
+end
+arch woodfloor
+x 21
+y 12
+end
 arch wwall_1_4
-x 20
-y 11
-end
-arch woodfloor
-x 20
+x 21
 y 12
 end
 arch woodfloor
-x 20
+x 21
 y 13
 end
 arch woodfloor
-x 20
+x 21
 y 14
 end
 arch woodfloor
-x 20
+x 21
 y 15
 end
 arch woodfloor
-x 20
+x 21
 y 16
 end
 arch woodfloor
-x 20
+x 21
 y 17
 end
 arch woodfloor
-x 20
+x 21
 y 18
 end
 arch woodfloor
-x 20
+x 21
 y 19
 end
 arch woodfloor
-x 20
-y 20
-end
-arch wwall_2_1_2
-x 20
+x 21
 y 20
 end
 arch woodfloor
 x 21
+y 21
 end
 arch wwall_2_1_2
 x 21
+y 21
+end
+arch cobblestones2
+x 21
+y 22
+end
+arch cobblestones2
+x 22
 end
 arch woodfloor
-x 21
+x 22
+y 1
+end
+arch wwall_2_1_2
+x 22
 y 1
 end
 arch woodfloor
-x 21
+x 22
 y 2
 end
 arch woodfloor
-x 21
+x 22
 y 3
 end
 arch woodfloor
-x 21
+x 22
 y 4
 end
 arch woodfloor
-x 21
+x 22
 y 5
 end
 arch woodfloor
-x 21
+x 22
 y 6
 end
 arch woodfloor
-x 21
-y 7
-end
-arch wwall_2_1_2
-x 21
+x 22
 y 7
 end
 arch woodfloor
-x 21
+x 22
 y 8
 end
-arch dungeon_magic
-x 21
+arch wwall_2_1_2
+x 22
 y 8
 end
+arch woodfloor
+x 22
+y 9
+end
+arch dungeon_magic
+x 22
+y 9
+end
 arch sign
 msg
 DO NOT ENTER!!!
 Wyverns for transport
 endmsg
-x 21
-y 8
-end
-arch woodfloor
-x 21
-y 9
-end
-arch dungeon_magic
-x 21
+x 22
 y 9
 end
 arch woodfloor
-x 21
+x 22
 y 10
 end
 arch dungeon_magic
-x 21
+x 22
 y 10
 end
+arch woodfloor
+x 22
+y 11
+end
+arch dungeon_magic
+x 22
+y 11
+end
 arch button_handle
-x 21
-y 10
+x 22
+y 11
 connected 10
 end
 arch woodfloor
-x 21
-y 11
+x 22
+y 12
 end
 arch wwall_2_1_2
-x 21
-y 11
-end
-arch woodfloor
-x 21
+x 22
 y 12
 end
 arch woodfloor
-x 21
+x 22
 y 13
 end
 arch woodfloor
-x 21
+x 22
 y 14
 end
 arch woodfloor
-x 21
+x 22
 y 15
 end
 arch woodfloor
-x 21
+x 22
 y 16
 end
 arch woodfloor
-x 21
+x 22
 y 17
 end
 arch woodfloor
-x 21
+x 22
 y 18
 end
 arch woodfloor
-x 21
+x 22
 y 19
 end
 arch woodfloor
-x 21
-y 20
-end
-arch wwall_2_1_2
-x 21
+x 22
 y 20
 end
 arch woodfloor
 x 22
+y 21
 end
 arch wwall_2_1_2
 x 22
+y 21
+end
+arch cobblestones2
+x 22
+y 22
+end
+arch cobblestones2
+x 23
 end
 arch woodfloor
-x 22
+x 23
+y 1
+end
+arch wwall_2_1_2
+x 23
 y 1
 end
 arch woodfloor
-x 22
+x 23
 y 2
 end
+arch woodfloor
+x 23
+y 3
+end
 arch generate_dragon
-x 22
-y 2
-end
-arch woodfloor
-x 22
+x 23
 y 3
 end
 arch woodfloor
-x 22
+x 23
 y 4
 end
 arch woodfloor
-x 22
+x 23
 y 5
 end
 arch woodfloor
-x 22
+x 23
 y 6
 end
 arch woodfloor
-x 22
-y 7
-end
-arch wwall_2_1_2
-x 22
+x 23
 y 7
 end
 arch woodfloor
-x 22
+x 23
 y 8
 end
-arch dungeon_magic
-x 22
-y 8
-end
-arch woodfloor
-x 22
-y 9
-end
-arch dungeon_magic
-x 22
-y 9
-end
-arch woodfloor
-x 22
-y 10
-end
-arch dungeon_magic
-x 22
-y 10
-end
-arch woodfloor
-x 22
-y 11
-end
 arch wwall_2_1_2
-x 22
+x 23
+y 8
+end
+arch woodfloor
+x 23
+y 9
+end
+arch dungeon_magic
+x 23
+y 9
+end
+arch woodfloor
+x 23
+y 10
+end
+arch dungeon_magic
+x 23
+y 10
+end
+arch woodfloor
+x 23
+y 11
+end
+arch dungeon_magic
+x 23
 y 11
 end
 arch woodfloor
-x 22
+x 23
+y 12
+end
+arch wwall_2_1_2
+x 23
 y 12
 end
 arch woodfloor
-x 22
+x 23
 y 13
 end
 arch woodfloor
-x 22
+x 23
 y 14
 end
 arch woodfloor
-x 22
+x 23
 y 15
 end
 arch woodfloor
-x 22
+x 23
 y 16
 end
 arch woodfloor
-x 22
+x 23
 y 17
 end
 arch woodfloor
-x 22
+x 23
 y 18
 end
 arch woodfloor
-x 22
+x 23
 y 19
 end
+arch woodfloor
+x 23
+y 20
+end
 arch random_food
-x 22
-y 19
-end
-arch woodfloor
-x 22
-y 20
-end
-arch wwall_2_1_2
-x 22
+x 23
 y 20
 end
 arch woodfloor
 x 23
+y 21
 end
 arch wwall_2_1_2
 x 23
+y 21
+end
+arch cobblestones2
+x 23
+y 22
+end
+arch cobblestones2
+x 24
 end
 arch woodfloor
-x 23
+x 24
+y 1
+end
+arch wwall_2_1_2
+x 24
 y 1
 end
 arch woodfloor
-x 23
+x 24
 y 2
 end
 arch woodfloor
-x 23
+x 24
 y 3
 end
 arch woodfloor
-x 23
+x 24
 y 4
 end
 arch woodfloor
-x 23
+x 24
 y 5
 end
 arch woodfloor
-x 23
+x 24
 y 6
 end
 arch woodfloor
-x 23
-y 7
-end
-arch wwall_2_1_2
-x 23
+x 24
 y 7
 end
 arch woodfloor
-x 23
+x 24
 y 8
 end
-arch dungeon_magic
-x 23
-y 8
-end
-arch woodfloor
-x 23
-y 9
-end
-arch dungeon_magic
-x 23
-y 9
-end
-arch woodfloor
-x 23
-y 10
-end
-arch dungeon_magic
-x 23
-y 10
-end
-arch woodfloor
-x 23
-y 11
-end
 arch wwall_2_1_2
-x 23
+x 24
+y 8
+end
+arch woodfloor
+x 24
+y 9
+end
+arch dungeon_magic
+x 24
+y 9
+end
+arch woodfloor
+x 24
+y 10
+end
+arch dungeon_magic
+x 24
+y 10
+end
+arch woodfloor
+x 24
+y 11
+end
+arch dungeon_magic
+x 24
 y 11
 end
 arch woodfloor
-x 23
+x 24
+y 12
+end
+arch wwall_2_1_2
+x 24
 y 12
 end
 arch woodfloor
-x 23
+x 24
 y 13
 end
 arch woodfloor
-x 23
+x 24
 y 14
 end
 arch woodfloor
-x 23
+x 24
 y 15
 end
 arch woodfloor
-x 23
+x 24
 y 16
 end
 arch woodfloor
-x 23
+x 24
 y 17
 end
 arch woodfloor
-x 23
-y 18
-end
-arch random_food
-x 23
+x 24
 y 18
 end
 arch woodfloor
-x 23
+x 24
 y 19
 end
 arch random_food
-x 23
+x 24
 y 19
 end
 arch woodfloor
-x 23
+x 24
 y 20
 end
-arch wwall_2_1_2
-x 23
+arch random_food
+x 24
 y 20
 end
 arch woodfloor
 x 24
+y 21
+end
+arch wwall_2_1_2
+x 24
+y 21
+end
+arch cobblestones2
+x 24
+y 22
+end
+arch cobblestones2
+x 25
+end
+arch woodfloor
+x 25
+y 1
 end
 arch wwall_2_2_3
-x 24
-end
-arch woodfloor
-x 24
-y 1
-end
-arch wwall_2_1_1
-x 24
+x 25
 y 1
 end
 arch woodfloor
-x 24
+x 25
 y 2
 end
 arch wwall_2_1_1
-x 24
+x 25
 y 2
 end
 arch woodfloor
-x 24
+x 25
 y 3
 end
 arch wwall_2_1_1
-x 24
+x 25
 y 3
 end
 arch woodfloor
-x 24
+x 25
 y 4
 end
 arch wwall_2_1_1
-x 24
+x 25
 y 4
 end
 arch woodfloor
-x 24
+x 25
 y 5
 end
 arch wwall_2_1_1
-x 24
+x 25
 y 5
 end
 arch woodfloor
-x 24
+x 25
 y 6
 end
 arch wwall_2_1_1
-x 24
+x 25
 y 6
 end
 arch woodfloor
-x 24
+x 25
 y 7
 end
+arch wwall_2_1_1
+x 25
+y 7
+end
+arch woodfloor
+x 25
+y 8
+end
 arch wwall_3_4
-x 24
-y 7
-end
-arch woodfloor
-x 24
-y 8
-end
-arch wwall_1_2
-x 24
+x 25
 y 8
 end
 arch woodfloor
-x 24
+x 25
 y 9
 end
+arch wwall_1_2
+x 25
+y 9
+end
+arch woodfloor
+x 25
+y 10
+end
 arch oakdoor_1
+x 25
+y 10
+end
+arch woodfloor
+x 25
+y 11
+end
+arch wwall_1_1
+x 25
+y 11
+end
+arch woodfloor
+x 25
+y 12
+end
+arch wwall_3_4
+x 25
+y 12
+end
+arch woodfloor
+x 25
+y 13
+end
+arch wwall_2_1_1
+x 25
+y 13
+end
+arch woodfloor
+x 25
+y 14
+end
+arch wwall_2_1_1
+x 25
+y 14
+end
+arch woodfloor
+x 25
+y 15
+end
+arch wwall_2_1_1
+x 25
+y 15
+end
+arch woodfloor
+x 25
+y 16
+end
+arch wwall_2_1_1
+x 25
+y 16
+end
+arch woodfloor
+x 25
+y 17
+end
+arch wwall_2_1_1
+x 25
+y 17
+end
+arch woodfloor
+x 25
+y 18
+end
+arch wwall_2_1_1
+x 25
+y 18
+end
+arch woodfloor
+x 25
+y 19
+end
+arch wwall_2_1_1
+x 25
+y 19
+end
+arch woodfloor
+x 25
+y 20
+end
+arch wwall_2_1_1
+x 25
+y 20
+end
+arch woodfloor
+x 25
+y 21
+end
+arch wwall_2_2_4
+x 25
+y 21
+end
+arch cobblestones2
+x 25
+y 22
+end
+arch cobblestones2
+x 26
+end
+arch cobblestones2
+x 26
+y 1
+end
+arch cobblestones2
+x 26
+y 2
+end
+arch cobblestones2
+x 26
+y 3
+end
+arch cobblestones2
+x 26
+y 4
+end
+arch cobblestones2
+x 26
+y 5
+end
+arch cobblestones2
+x 26
+y 6
+end
+arch cobblestones2
+x 26
+y 7
+end
+arch cobblestones2
+x 26
+y 8
+end
+arch cobblestones2
+x 26
+y 9
+end
+arch invis_exit
 slaying /world/world_122_116
 hp 17
 sp 43
-x 24
+x 26
 y 9
 end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 10
 end
-arch wwall_1_1
-x 24
+arch invis_exit
+slaying /world/world_122_116
+hp 17
+sp 43
+x 26
 y 10
 end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 11
 end
-arch wwall_3_4
-x 24
+arch invis_exit
+slaying /world/world_122_116
+hp 17
+sp 43
+x 26
 y 11
 end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 12
 end
-arch wwall_2_1_1
-x 24
-y 12
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 13
 end
-arch wwall_2_1_1
-x 24
-y 13
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 14
 end
-arch wwall_2_1_1
-x 24
-y 14
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 15
 end
-arch wwall_2_1_1
-x 24
-y 15
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 16
 end
-arch wwall_2_1_1
-x 24
-y 16
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 17
 end
-arch wwall_2_1_1
-x 24
-y 17
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 18
 end
-arch wwall_2_1_1
-x 24
-y 18
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 19
 end
-arch wwall_2_1_1
-x 24
-y 19
-end
-arch woodfloor
-x 24
+arch cobblestones2
+x 26
 y 20
 end
-arch wwall_2_2_4
-x 24
-y 20
+arch cobblestones2
+x 26
+y 21
+end
+arch cobblestones2
+x 26
+y 22
 end
diff --git a/world/world_122_116 b/world/world_122_116
index 0c4fe6bf5..0bd27f924 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -5900,8 +5900,8 @@ end
 arch barn_west
 name Warehouse #5
 slaying /navar_city/warehouse5
-hp 24
-sp 9
+hp 25
+sp 10
 x 16
 y 42
 end