diff --git a/dragonisland/hangar b/dragonisland/hangar
index 03f97c2a9..f91240a78 100644
--- a/dragonisland/hangar
+++ b/dragonisland/hangar
@@ -3,12 +3,12 @@ name Stoneville Dragon Hangar
 difficulty 10
 region stoneville
 width 35
-height 32
+height 36
 enter_x 15
 enter_y 1
 msg
 Created:  1997-06-19
-Modified: 2013-03-30 Kevin Zheng
+Modified: 2014-12-28 Rick Tanner
 endmsg
 end
 arch magic_banned
@@ -59,7 +59,7 @@ end
 arch cobblestones2
 y 5
 end
-arch awall_3_2
+arch awall_2_1_1
 y 5
 end
 arch magic_banned
@@ -86,7 +86,7 @@ end
 arch cobblestones2
 y 8
 end
-arch awall_2_1_1
+arch awall_3_2
 y 8
 end
 arch magic_banned
@@ -131,9 +131,6 @@ end
 arch cobblestones2
 y 13
 end
-arch cobblestones2
-y 13
-end
 arch awall_2_1_1
 y 13
 end
@@ -143,9 +140,6 @@ end
 arch cobblestones2
 y 14
 end
-arch cobblestones2
-y 14
-end
 arch awall_2_1_1
 y 14
 end
@@ -155,9 +149,6 @@ end
 arch cobblestones2
 y 15
 end
-arch cobblestones2
-y 15
-end
 arch awall_2_1_1
 y 15
 end
@@ -206,9 +197,6 @@ end
 arch cobblestones2
 y 19
 end
-arch cobblestones2
-y 19
-end
 arch awall_2_1_1
 y 19
 end
@@ -245,6 +233,9 @@ end
 arch cobblestones2
 y 22
 end
+arch cobblestones2
+y 22
+end
 arch awall_2_1_1
 y 22
 end
@@ -353,8 +344,47 @@ end
 arch cobblestones2
 y 31
 end
+arch awall_2_1_1
+y 31
+end
+arch magic_banned
+y 32
+end
+arch cobblestones2
+y 32
+end
+arch cobblestones2
+y 32
+end
+arch awall_2_1_1
+y 32
+end
+arch magic_banned
+y 33
+end
+arch cobblestones2
+y 33
+end
+arch cobblestones2
+y 33
+end
+arch awall_2_1_1
+y 33
+end
+arch magic_banned
+y 34
+end
+arch cobblestones2
+y 34
+end
+arch cobblestones2
+y 34
+end
 arch awall_2_2_1
-y 31
+y 34
+end
+arch blocked
+y 35
 end
 arch magic_banned
 x 1
@@ -370,11 +400,11 @@ x 1
 y 1
 end
 arch creator
-slaying Ticket To Port Joseph
+slaying Ticket To Brest
 other_arch card
 x 1
 y 1
-connected 20
+connected 25
 lifesave 1
 end
 arch cobblestones2
@@ -387,7 +417,7 @@ y 2
 end
 arch magic_mouth
 msg
-Drop 100 gold coins to buy a ticket to Port Joseph.
+Drop 1000 gold coins to buy a ticket to Brest.
 endmsg
 x 1
 y 2
@@ -399,11 +429,16 @@ end
 arch altar_trigger
 name Ticket Booth
 slaying money
-food 1000
+food 10000
 x 1
 y 2
 last_sp 1
-connected 20
+connected 25
+end
+arch pedestal
+x 1
+y 3
+connected 70
 end
 arch magic_banned
 x 1
@@ -413,48 +448,77 @@ arch cobblestones2
 x 1
 y 3
 end
+arch igateTrg1
+x 1
+y 3
+connected 70
+end
 arch magic_banned
 x 1
 y 4
 end
+arch magic_mouth
+msg
+Say the command words from the sign to purchase a flight ticket to Brest.
+endmsg
+x 1
+y 4
+end
+arch magic_ear
+msg
+@match dangerous return
+Click.
+endmsg
+x 1
+y 4
+connected 70
+end
 arch cobblestones2
 x 1
 y 4
 end
+arch magic_banned
+x 1
+y 5
+end
+arch cobblestones2
+x 1
+y 5
+end
+arch sign
+msg
+Good day, traveller!
+The landscape around Brest makes a return dragon flight not possible. So when travelling to the great Kingdom of Brittany, you will have to find your own way home. Either through magical means or brave the dangerous and deadly ice swept path through the mountains.
+
+You have been warned!
+
+Say, "Dangerous return" to open the gate to purchase your flight ticket.
+endmsg
+x 1
+y 5
+end
+arch magic_banned
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 6
+end
+arch magic_banned
+x 1
+y 7
+end
+arch cobblestones2
+x 1
+y 7
+end
 arch table_2
 x 1
-y 4
+y 7
 end
 arch random_food
 x 1
-y 4
-end
-arch magic_banned
-x 1
-y 5
-end
-arch cobblestones2
-x 1
-y 5
-end
-arch awall_2_1_2
-x 1
-y 5
-end
-arch magic_banned
-x 1
-y 6
-end
-arch cobblestones2
-x 1
-y 6
-end
-arch magic_banned
-x 1
-y 7
-end
-arch cobblestones2
-x 1
 y 7
 end
 arch magic_banned
@@ -465,6 +529,10 @@ arch cobblestones2
 x 1
 y 8
 end
+arch awall_2_1_2
+x 1
+y 8
+end
 arch magic_banned
 x 1
 y 9
@@ -649,9 +717,37 @@ arch cobblestones2
 x 1
 y 31
 end
+arch magic_banned
+x 1
+y 32
+end
+arch cobblestones2
+x 1
+y 32
+end
+arch magic_banned
+x 1
+y 33
+end
+arch cobblestones2
+x 1
+y 33
+end
+arch magic_banned
+x 1
+y 34
+end
+arch cobblestones2
+x 1
+y 34
+end
 arch awall_2_1_2
 x 1
-y 31
+y 34
+end
+arch blocked
+x 1
+y 35
 end
 arch magic_banned
 x 2
@@ -682,7 +778,7 @@ arch cobblestones2
 x 2
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 2
 y 2
 end
@@ -694,6 +790,10 @@ arch cobblestones2
 x 2
 y 3
 end
+arch awall_2_1_1
+x 2
+y 3
+end
 arch magic_banned
 x 2
 y 4
@@ -702,76 +802,72 @@ arch cobblestones2
 x 2
 y 4
 end
+arch awall_2_1_1
+x 2
+y 4
+end
+arch magic_banned
+x 2
+y 5
+end
+arch cobblestones2
+x 2
+y 5
+end
+arch awall_1_2
+x 2
+y 5
+end
+arch magic_banned
+x 2
+y 6
+end
+arch cobblestones2
+x 2
+y 6
+end
+arch magic_banned
+x 2
+y 7
+end
+arch cobblestones2
+x 2
+y 7
+end
 arch chair_1.3
 x 2
-y 4
+y 7
 end
 arch magic_banned
 x 2
-y 5
+y 8
 end
 arch cobblestones2
 x 2
-y 5
+y 8
 end
 arch awall_2_1_2
 x 2
-y 5
+y 8
 end
 arch magic_banned
 x 2
-y 6
+y 9
 end
 arch cobblestones2
 x 2
-y 6
+y 9
 end
 arch magic_banned
 x 2
-y 7
+y 10
 end
 arch cobblestones2
 x 2
-y 7
+y 10
 end
 arch swall_2_2_2
 x 2
-y 7
-end
-arch magic_banned
-x 2
-y 8
-end
-arch cobblestones2
-x 2
-y 8
-end
-arch swall_2_1_1
-x 2
-y 8
-end
-arch magic_banned
-x 2
-y 9
-end
-arch cobblestones2
-x 2
-y 9
-end
-arch swall_2_1_1
-x 2
-y 9
-end
-arch magic_banned
-x 2
-y 10
-end
-arch cobblestones2
-x 2
-y 10
-end
-arch swall_2_2_1
-x 2
 y 10
 end
 arch magic_banned
@@ -782,6 +878,10 @@ arch cobblestones2
 x 2
 y 11
 end
+arch swall_2_1_1
+x 2
+y 11
+end
 arch magic_banned
 x 2
 y 12
@@ -790,6 +890,10 @@ arch cobblestones2
 x 2
 y 12
 end
+arch swall_2_1_1
+x 2
+y 12
+end
 arch magic_banned
 x 2
 y 13
@@ -798,7 +902,7 @@ arch cobblestones2
 x 2
 y 13
 end
-arch swall_2_2_2
+arch swall_2_2_1
 x 2
 y 13
 end
@@ -810,10 +914,6 @@ arch cobblestones2
 x 2
 y 14
 end
-arch swall_2_1_1
-x 2
-y 14
-end
 arch magic_banned
 x 2
 y 15
@@ -822,10 +922,6 @@ arch cobblestones2
 x 2
 y 15
 end
-arch swall_2_1_1
-x 2
-y 15
-end
 arch magic_banned
 x 2
 y 16
@@ -834,7 +930,7 @@ arch cobblestones2
 x 2
 y 16
 end
-arch swall_2_2_1
+arch swall_2_2_2
 x 2
 y 16
 end
@@ -846,6 +942,10 @@ arch cobblestones2
 x 2
 y 17
 end
+arch swall_2_1_1
+x 2
+y 17
+end
 arch magic_banned
 x 2
 y 18
@@ -854,6 +954,10 @@ arch cobblestones2
 x 2
 y 18
 end
+arch swall_2_1_1
+x 2
+y 18
+end
 arch magic_banned
 x 2
 y 19
@@ -862,7 +966,7 @@ arch cobblestones2
 x 2
 y 19
 end
-arch swall_2_2_2
+arch swall_2_2_1
 x 2
 y 19
 end
@@ -874,10 +978,6 @@ arch cobblestones2
 x 2
 y 20
 end
-arch swall_2_1_1
-x 2
-y 20
-end
 arch magic_banned
 x 2
 y 21
@@ -886,10 +986,6 @@ arch cobblestones2
 x 2
 y 21
 end
-arch swall_2_1_1
-x 2
-y 21
-end
 arch magic_banned
 x 2
 y 22
@@ -898,36 +994,44 @@ arch cobblestones2
 x 2
 y 22
 end
-arch swall_2_2_1
-x 2
-y 22
-end
-arch magic_banned
-x 2
-y 23
-end
-arch cobblestones2
-x 2
-y 23
-end
-arch magic_banned
-x 2
-y 24
-end
-arch cobblestones2
-x 2
-y 24
-end
-arch magic_banned
-x 2
-y 25
-end
-arch cobblestones2
-x 2
-y 25
-end
 arch swall_2_2_2
 x 2
+y 22
+end
+arch magic_banned
+x 2
+y 23
+end
+arch cobblestones2
+x 2
+y 23
+end
+arch swall_2_1_1
+x 2
+y 23
+end
+arch magic_banned
+x 2
+y 24
+end
+arch cobblestones2
+x 2
+y 24
+end
+arch swall_2_1_1
+x 2
+y 24
+end
+arch magic_banned
+x 2
+y 25
+end
+arch cobblestones2
+x 2
+y 25
+end
+arch swall_2_2_1
+x 2
 y 25
 end
 arch magic_banned
@@ -938,10 +1042,6 @@ arch cobblestones2
 x 2
 y 26
 end
-arch swall_2_1_1
-x 2
-y 26
-end
 arch magic_banned
 x 2
 y 27
@@ -950,10 +1050,6 @@ arch cobblestones2
 x 2
 y 27
 end
-arch swall_2_1_1
-x 2
-y 27
-end
 arch magic_banned
 x 2
 y 28
@@ -962,37 +1058,77 @@ arch cobblestones2
 x 2
 y 28
 end
+arch swall_2_2_2
+x 2
+y 28
+end
+arch magic_banned
+x 2
+y 29
+end
+arch cobblestones2
+x 2
+y 29
+end
+arch swall_2_1_1
+x 2
+y 29
+end
+arch magic_banned
+x 2
+y 30
+end
+arch cobblestones2
+x 2
+y 30
+end
+arch swall_2_1_1
+x 2
+y 30
+end
+arch magic_banned
+x 2
+y 31
+end
+arch cobblestones2
+x 2
+y 31
+end
 arch swall_2_2_1
 x 2
-y 28
-end
-arch magic_banned
-x 2
-y 29
-end
-arch cobblestones2
-x 2
-y 29
-end
-arch magic_banned
-x 2
-y 30
-end
-arch cobblestones2
-x 2
-y 30
-end
-arch magic_banned
-x 2
 y 31
 end
+arch magic_banned
+x 2
+y 32
+end
 arch cobblestones2
 x 2
-y 31
+y 32
+end
+arch magic_banned
+x 2
+y 33
+end
+arch cobblestones2
+x 2
+y 33
+end
+arch magic_banned
+x 2
+y 34
+end
+arch cobblestones2
+x 2
+y 34
 end
 arch awall_2_1_2
 x 2
-y 31
+y 34
+end
+arch blocked
+x 2
+y 35
 end
 arch magic_banned
 x 3
@@ -1059,53 +1195,77 @@ arch cobblestones2
 x 3
 y 4
 end
+arch magic_banned
+x 3
+y 5
+end
+arch cobblestones2
+x 3
+y 5
+end
+arch magic_banned
+x 3
+y 6
+end
+arch cobblestones2
+x 3
+y 6
+end
+arch magic_banned
+x 3
+y 7
+end
+arch cobblestones2
+x 3
+y 7
+end
 arch table_2
 x 3
-y 4
+y 7
 end
 arch random_food
 x 3
-y 4
+y 7
 end
 arch magic_banned
 x 3
-y 5
+y 8
 end
 arch cobblestones2
 x 3
-y 5
+y 8
 end
 arch awall_2_1_2
 x 3
-y 5
+y 8
 end
 arch magic_banned
 x 3
-y 6
+y 9
 end
 arch cobblestones2
 x 3
-y 6
+y 9
 end
 arch magic_banned
 x 3
-y 7
+y 10
 end
 arch cobblestones2
 x 3
-y 7
+y 10
 end
 arch swall_2_1_2
 x 3
-y 7
+y 10
 end
 arch magic_banned
 x 3
-y 8
+y 11
 end
 arch cobblestones2
 x 3
-y 8
+y 11
 end
 arch dragon_exit
 name dragon express
@@ -1116,34 +1276,6 @@ endmsg
 hp 16
 sp 39
 x 3
-y 8
-end
-arch magic_banned
-x 3
-y 9
-end
-arch cobblestones2
-x 3
-y 9
-end
-arch magic_banned
-x 3
-y 10
-end
-arch cobblestones2
-x 3
-y 10
-end
-arch swall_2_1_2
-x 3
-y 10
-end
-arch magic_banned
-x 3
-y 11
-end
-arch cobblestones2
-x 3
 y 11
 end
 arch magic_banned
@@ -1174,6 +1306,34 @@ arch cobblestones2
 x 3
 y 14
 end
+arch magic_banned
+x 3
+y 15
+end
+arch cobblestones2
+x 3
+y 15
+end
+arch magic_banned
+x 3
+y 16
+end
+arch cobblestones2
+x 3
+y 16
+end
+arch swall_2_1_2
+x 3
+y 16
+end
+arch magic_banned
+x 3
+y 17
+end
+arch cobblestones2
+x 3
+y 17
+end
 arch dragon_exit
 name dragon express
 slaying /pup_land/rainbow/station
@@ -1183,34 +1343,6 @@ endmsg
 hp 7
 sp 3
 x 3
-y 14
-end
-arch magic_banned
-x 3
-y 15
-end
-arch cobblestones2
-x 3
-y 15
-end
-arch magic_banned
-x 3
-y 16
-end
-arch cobblestones2
-x 3
-y 16
-end
-arch swall_2_1_2
-x 3
-y 16
-end
-arch magic_banned
-x 3
-y 17
-end
-arch cobblestones2
-x 3
 y 17
 end
 arch magic_banned
@@ -1241,6 +1373,34 @@ arch cobblestones2
 x 3
 y 20
 end
+arch magic_banned
+x 3
+y 21
+end
+arch cobblestones2
+x 3
+y 21
+end
+arch magic_banned
+x 3
+y 22
+end
+arch cobblestones2
+x 3
+y 22
+end
+arch swall_2_1_2
+x 3
+y 22
+end
+arch magic_banned
+x 3
+y 23
+end
+arch cobblestones2
+x 3
+y 23
+end
 arch dragon_exit
 name dragon express
 slaying /world/world_128_109
@@ -1250,34 +1410,6 @@ endmsg
 hp 35
 sp 13
 x 3
-y 20
-end
-arch magic_banned
-x 3
-y 21
-end
-arch cobblestones2
-x 3
-y 21
-end
-arch magic_banned
-x 3
-y 22
-end
-arch cobblestones2
-x 3
-y 22
-end
-arch swall_2_1_2
-x 3
-y 22
-end
-arch magic_banned
-x 3
-y 23
-end
-arch cobblestones2
-x 3
 y 23
 end
 arch magic_banned
@@ -1308,6 +1440,34 @@ arch cobblestones2
 x 3
 y 26
 end
+arch magic_banned
+x 3
+y 27
+end
+arch cobblestones2
+x 3
+y 27
+end
+arch magic_banned
+x 3
+y 28
+end
+arch cobblestones2
+x 3
+y 28
+end
+arch swall_2_1_2
+x 3
+y 28
+end
+arch magic_banned
+x 3
+y 29
+end
+arch cobblestones2
+x 3
+y 29
+end
 arch dragon_exit
 name dragon express
 slaying /world/world_107_123
@@ -1317,55 +1477,59 @@ endmsg
 hp 32
 sp 30
 x 3
-y 26
+y 29
 end
 arch magic_banned
 x 3
-y 27
+y 30
 end
 arch cobblestones2
 x 3
-y 27
+y 30
 end
 arch magic_banned
 x 3
-y 28
+y 31
 end
 arch cobblestones2
 x 3
-y 28
+y 31
 end
 arch swall_2_1_2
 x 3
-y 28
-end
-arch magic_banned
-x 3
-y 29
-end
-arch cobblestones2
-x 3
-y 29
-end
-arch magic_banned
-x 3
-y 30
-end
-arch cobblestones2
-x 3
-y 30
-end
-arch magic_banned
-x 3
 y 31
 end
+arch magic_banned
+x 3
+y 32
+end
 arch cobblestones2
 x 3
-y 31
+y 32
+end
+arch magic_banned
+x 3
+y 33
+end
+arch cobblestones2
+x 3
+y 33
+end
+arch magic_banned
+x 3
+y 34
+end
+arch cobblestones2
+x 3
+y 34
 end
 arch awall_2_1_2
 x 3
-y 31
+y 34
+end
+arch blocked
+x 3
+y 35
 end
 arch magic_banned
 x 4
@@ -1396,7 +1560,7 @@ arch cobblestones2
 x 4
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 4
 y 2
 end
@@ -1408,6 +1572,10 @@ arch cobblestones2
 x 4
 y 3
 end
+arch awall_1_2
+x 4
+y 3
+end
 arch magic_banned
 x 4
 y 4
@@ -1416,40 +1584,32 @@ arch cobblestones2
 x 4
 y 4
 end
+arch magic_banned
+x 4
+y 5
+end
+arch cobblestones2
+x 4
+y 5
+end
+arch magic_banned
+x 4
+y 6
+end
+arch cobblestones2
+x 4
+y 6
+end
+arch magic_banned
+x 4
+y 7
+end
+arch cobblestones2
+x 4
+y 7
+end
 arch chair_1.3
 x 4
-y 4
-end
-arch magic_banned
-x 4
-y 5
-end
-arch cobblestones2
-x 4
-y 5
-end
-arch awall_2_1_2
-x 4
-y 5
-end
-arch magic_banned
-x 4
-y 6
-end
-arch cobblestones2
-x 4
-y 6
-end
-arch magic_banned
-x 4
-y 7
-end
-arch cobblestones2
-x 4
-y 7
-end
-arch swall_2_1_2
-x 4
 y 7
 end
 arch magic_banned
@@ -1460,6 +1620,10 @@ arch cobblestones2
 x 4
 y 8
 end
+arch awall_2_1_2
+x 4
+y 8
+end
 arch magic_banned
 x 4
 y 9
@@ -1672,11 +1836,43 @@ arch cobblestones2
 x 4
 y 31
 end
-arch awall_2_1_2
+arch swall_2_1_2
 x 4
 y 31
 end
 arch magic_banned
+x 4
+y 32
+end
+arch cobblestones2
+x 4
+y 32
+end
+arch magic_banned
+x 4
+y 33
+end
+arch cobblestones2
+x 4
+y 33
+end
+arch magic_banned
+x 4
+y 34
+end
+arch cobblestones2
+x 4
+y 34
+end
+arch awall_2_1_2
+x 4
+y 34
+end
+arch blocked
+x 4
+y 35
+end
+arch magic_banned
 x 5
 end
 arch cobblestones2
@@ -1741,44 +1937,36 @@ arch cobblestones2
 x 5
 y 4
 end
+arch magic_banned
+x 5
+y 5
+end
+arch cobblestones2
+x 5
+y 5
+end
+arch magic_banned
+x 5
+y 6
+end
+arch cobblestones2
+x 5
+y 6
+end
+arch magic_banned
+x 5
+y 7
+end
+arch cobblestones2
+x 5
+y 7
+end
 arch table_2
 x 5
-y 4
+y 7
 end
 arch booze
 x 5
-y 4
-end
-arch magic_banned
-x 5
-y 5
-end
-arch cobblestones2
-x 5
-y 5
-end
-arch awall_2_1_2
-x 5
-y 5
-end
-arch magic_banned
-x 5
-y 6
-end
-arch cobblestones2
-x 5
-y 6
-end
-arch magic_banned
-x 5
-y 7
-end
-arch cobblestones2
-x 5
-y 7
-end
-arch swall_2_1_2
-x 5
 y 7
 end
 arch magic_banned
@@ -1789,6 +1977,10 @@ arch cobblestones2
 x 5
 y 8
 end
+arch awall_2_1_2
+x 5
+y 8
+end
 arch magic_banned
 x 5
 y 9
@@ -2001,11 +2193,43 @@ arch cobblestones2
 x 5
 y 31
 end
-arch awall_2_1_2
+arch swall_2_1_2
 x 5
 y 31
 end
 arch magic_banned
+x 5
+y 32
+end
+arch cobblestones2
+x 5
+y 32
+end
+arch magic_banned
+x 5
+y 33
+end
+arch cobblestones2
+x 5
+y 33
+end
+arch magic_banned
+x 5
+y 34
+end
+arch cobblestones2
+x 5
+y 34
+end
+arch awall_2_1_2
+x 5
+y 34
+end
+arch blocked
+x 5
+y 35
+end
+arch magic_banned
 x 6
 end
 arch cobblestones2
@@ -2034,7 +2258,7 @@ arch cobblestones2
 x 6
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 6
 y 2
 end
@@ -2046,6 +2270,10 @@ arch cobblestones2
 x 6
 y 3
 end
+arch awall_1_2
+x 6
+y 3
+end
 arch magic_banned
 x 6
 y 4
@@ -2054,301 +2282,329 @@ arch cobblestones2
 x 6
 y 4
 end
+arch magic_banned
+x 6
+y 5
+end
+arch cobblestones2
+x 6
+y 5
+end
+arch magic_banned
+x 6
+y 6
+end
+arch cobblestones2
+x 6
+y 6
+end
+arch magic_banned
+x 6
+y 7
+end
+arch cobblestones2
+x 6
+y 7
+end
 arch chair_1.3
 x 6
-y 4
+y 7
 end
 arch magic_banned
 x 6
-y 5
+y 8
 end
 arch cobblestones2
 x 6
-y 5
+y 8
 end
 arch awall_2_1_2
 x 6
-y 5
+y 8
 end
 arch magic_banned
 x 6
-y 6
+y 9
 end
 arch cobblestones2
 x 6
-y 6
+y 9
 end
 arch magic_banned
 x 6
-y 7
+y 10
 end
 arch cobblestones2
 x 6
-y 7
+y 10
 end
 arch swall_2_2_3
 x 6
-y 7
+y 10
 end
 arch magic_banned
 x 6
-y 8
+y 11
 end
 arch cobblestones2
 x 6
-y 8
+y 11
 end
 arch swall_1_2
 x 6
-y 8
+y 11
 end
 arch magic_banned
 x 6
-y 9
+y 12
 end
 arch cobblestones2
 x 6
-y 9
+y 12
 end
 arch grate_closed_2
 x 6
-y 9
+y 12
 connected 40
 end
 arch magic_banned
 x 6
-y 10
+y 13
 end
 arch cobblestones2
 x 6
-y 10
+y 13
 end
 arch swall_1_3
 x 6
-y 10
-end
-arch magic_banned
-x 6
-y 11
-end
-arch cobblestones2
-x 6
-y 11
-end
-arch magic_banned
-x 6
-y 12
-end
-arch cobblestones2
-x 6
-y 12
-end
-arch magic_banned
-x 6
 y 13
 end
+arch magic_banned
+x 6
+y 14
+end
 arch cobblestones2
 x 6
-y 13
+y 14
+end
+arch magic_banned
+x 6
+y 15
+end
+arch cobblestones2
+x 6
+y 15
+end
+arch magic_banned
+x 6
+y 16
+end
+arch cobblestones2
+x 6
+y 16
 end
 arch swall_2_2_3
 x 6
-y 13
+y 16
 end
 arch magic_banned
 x 6
-y 14
+y 17
 end
 arch cobblestones2
 x 6
-y 14
+y 17
 end
 arch swall_1_2
 x 6
-y 14
+y 17
 end
 arch magic_banned
 x 6
-y 15
+y 18
 end
 arch cobblestones2
 x 6
-y 15
+y 18
 end
 arch grate_closed_2
 x 6
-y 15
+y 18
 connected 3
 end
 arch magic_banned
 x 6
-y 16
+y 19
 end
 arch cobblestones2
 x 6
-y 16
+y 19
 end
 arch swall_1_3
 x 6
-y 16
-end
-arch magic_banned
-x 6
-y 17
-end
-arch cobblestones2
-x 6
-y 17
-end
-arch magic_banned
-x 6
-y 18
-end
-arch cobblestones2
-x 6
-y 18
-end
-arch magic_banned
-x 6
 y 19
 end
+arch magic_banned
+x 6
+y 20
+end
 arch cobblestones2
 x 6
-y 19
+y 20
+end
+arch magic_banned
+x 6
+y 21
+end
+arch cobblestones2
+x 6
+y 21
+end
+arch magic_banned
+x 6
+y 22
+end
+arch cobblestones2
+x 6
+y 22
 end
 arch swall_2_2_3
 x 6
-y 19
+y 22
 end
 arch magic_banned
 x 6
-y 20
+y 23
 end
 arch cobblestones2
 x 6
-y 20
+y 23
 end
 arch swall_1_2
 x 6
-y 20
+y 23
 end
 arch magic_banned
 x 6
-y 21
+y 24
 end
 arch cobblestones2
 x 6
-y 21
+y 24
 end
 arch grate_closed_2
 x 6
-y 21
+y 24
 connected 5
 end
 arch magic_banned
 x 6
-y 22
+y 25
 end
 arch cobblestones2
 x 6
-y 22
+y 25
 end
 arch swall_1_3
 x 6
-y 22
-end
-arch magic_banned
-x 6
-y 23
-end
-arch cobblestones2
-x 6
-y 23
-end
-arch magic_banned
-x 6
-y 24
-end
-arch cobblestones2
-x 6
-y 24
-end
-arch magic_banned
-x 6
 y 25
 end
+arch magic_banned
+x 6
+y 26
+end
 arch cobblestones2
 x 6
-y 25
+y 26
+end
+arch magic_banned
+x 6
+y 27
+end
+arch cobblestones2
+x 6
+y 27
+end
+arch magic_banned
+x 6
+y 28
+end
+arch cobblestones2
+x 6
+y 28
 end
 arch swall_2_2_3
 x 6
-y 25
+y 28
 end
 arch magic_banned
 x 6
-y 26
+y 29
 end
 arch cobblestones2
 x 6
-y 26
+y 29
 end
 arch swall_1_2
 x 6
-y 26
+y 29
 end
 arch magic_banned
 x 6
-y 27
+y 30
 end
 arch cobblestones2
 x 6
-y 27
+y 30
 end
 arch grate_closed_2
 x 6
-y 27
+y 30
 connected 7
 end
 arch magic_banned
 x 6
-y 28
+y 31
 end
 arch cobblestones2
 x 6
-y 28
+y 31
 end
 arch swall_1_3
 x 6
-y 28
-end
-arch magic_banned
-x 6
-y 29
-end
-arch cobblestones2
-x 6
-y 29
-end
-arch magic_banned
-x 6
-y 30
-end
-arch cobblestones2
-x 6
-y 30
-end
-arch magic_banned
-x 6
 y 31
 end
+arch magic_banned
+x 6
+y 32
+end
 arch cobblestones2
 x 6
-y 31
+y 32
+end
+arch magic_banned
+x 6
+y 33
+end
+arch cobblestones2
+x 6
+y 33
+end
+arch magic_banned
+x 6
+y 34
+end
+arch cobblestones2
+x 6
+y 34
 end
 arch awall_2_1_2
 x 6
-y 31
+y 34
+end
+arch blocked
+x 6
+y 35
 end
 arch magic_banned
 x 7
@@ -2415,91 +2671,91 @@ arch cobblestones2
 x 7
 y 4
 end
+arch magic_banned
+x 7
+y 5
+end
+arch cobblestones2
+x 7
+y 5
+end
+arch magic_banned
+x 7
+y 6
+end
+arch cobblestones2
+x 7
+y 6
+end
+arch magic_banned
+x 7
+y 7
+end
+arch cobblestones2
+x 7
+y 7
+end
 arch table_2
 x 7
-y 4
+y 7
 end
 arch random_food
 x 7
-y 4
+y 7
 end
 arch magic_banned
 x 7
-y 5
+y 8
 end
 arch cobblestones2
 x 7
-y 5
+y 8
 end
 arch awall_2_1_2
 x 7
-y 5
-end
-arch magic_banned
-x 7
-y 6
-end
-arch cobblestones2
-x 7
-y 6
-end
-arch magic_banned
-x 7
-y 7
-end
-arch cobblestones2
-x 7
-y 7
-end
-arch magic_banned
-x 7
 y 8
 end
+arch magic_banned
+x 7
+y 9
+end
 arch cobblestones2
 x 7
-y 8
+y 9
+end
+arch magic_banned
+x 7
+y 10
+end
+arch cobblestones2
+x 7
+y 10
+end
+arch magic_banned
+x 7
+y 11
+end
+arch cobblestones2
+x 7
+y 11
 end
 arch altar_trigger
 name To Port Joseph
 slaying Ticket To Port Joseph
 food 1
 x 7
-y 8
+y 11
 connected 40
 end
 arch magic_banned
 x 7
-y 9
+y 12
 end
 arch magic_mouth
 msg
 Port Joseph
 endmsg
 x 7
-y 9
-end
-arch cobblestones2
-x 7
-y 9
-end
-arch magic_banned
-x 7
-y 10
-end
-arch cobblestones2
-x 7
-y 10
-end
-arch magic_banned
-x 7
-y 11
-end
-arch cobblestones2
-x 7
-y 11
-end
-arch magic_banned
-x 7
 y 12
 end
 arch cobblestones2
@@ -2522,47 +2778,47 @@ arch cobblestones2
 x 7
 y 14
 end
+arch magic_banned
+x 7
+y 15
+end
+arch cobblestones2
+x 7
+y 15
+end
+arch magic_banned
+x 7
+y 16
+end
+arch cobblestones2
+x 7
+y 16
+end
+arch magic_banned
+x 7
+y 17
+end
+arch cobblestones2
+x 7
+y 17
+end
 arch altar_trigger
 name To Red Town
 slaying Ticket To Red Town
 food 1
 x 7
-y 14
+y 17
 connected 3
 end
 arch magic_banned
 x 7
-y 15
+y 18
 end
 arch magic_mouth
 msg
 Red Town
 endmsg
 x 7
-y 15
-end
-arch cobblestones2
-x 7
-y 15
-end
-arch magic_banned
-x 7
-y 16
-end
-arch cobblestones2
-x 7
-y 16
-end
-arch magic_banned
-x 7
-y 17
-end
-arch cobblestones2
-x 7
-y 17
-end
-arch magic_banned
-x 7
 y 18
 end
 arch cobblestones2
@@ -2585,47 +2841,47 @@ arch cobblestones2
 x 7
 y 20
 end
+arch magic_banned
+x 7
+y 21
+end
+arch cobblestones2
+x 7
+y 21
+end
+arch magic_banned
+x 7
+y 22
+end
+arch cobblestones2
+x 7
+y 22
+end
+arch magic_banned
+x 7
+y 23
+end
+arch cobblestones2
+x 7
+y 23
+end
 arch altar_trigger
 name To Wolfsburg
 slaying Ticket To Wolfsburg
 food 1
 x 7
-y 20
+y 23
 connected 5
 end
 arch magic_banned
 x 7
-y 21
+y 24
 end
 arch magic_mouth
 msg
 Wolfsburg
 endmsg
 x 7
-y 21
-end
-arch cobblestones2
-x 7
-y 21
-end
-arch magic_banned
-x 7
-y 22
-end
-arch cobblestones2
-x 7
-y 22
-end
-arch magic_banned
-x 7
-y 23
-end
-arch cobblestones2
-x 7
-y 23
-end
-arch magic_banned
-x 7
 y 24
 end
 arch cobblestones2
@@ -2648,47 +2904,47 @@ arch cobblestones2
 x 7
 y 26
 end
+arch magic_banned
+x 7
+y 27
+end
+arch cobblestones2
+x 7
+y 27
+end
+arch magic_banned
+x 7
+y 28
+end
+arch cobblestones2
+x 7
+y 28
+end
+arch magic_banned
+x 7
+y 29
+end
+arch cobblestones2
+x 7
+y 29
+end
 arch altar_trigger
 name To Brest
 slaying Ticket To Brest
 food 1
 x 7
-y 26
+y 29
 connected 7
 end
 arch magic_banned
 x 7
-y 27
+y 30
 end
 arch magic_mouth
 msg
 Brest
 endmsg
 x 7
-y 27
-end
-arch cobblestones2
-x 7
-y 27
-end
-arch magic_banned
-x 7
-y 28
-end
-arch cobblestones2
-x 7
-y 28
-end
-arch magic_banned
-x 7
-y 29
-end
-arch cobblestones2
-x 7
-y 29
-end
-arch magic_banned
-x 7
 y 30
 end
 arch cobblestones2
@@ -2703,9 +2959,37 @@ arch cobblestones2
 x 7
 y 31
 end
+arch magic_banned
+x 7
+y 32
+end
+arch cobblestones2
+x 7
+y 32
+end
+arch magic_banned
+x 7
+y 33
+end
+arch cobblestones2
+x 7
+y 33
+end
+arch magic_banned
+x 7
+y 34
+end
+arch cobblestones2
+x 7
+y 34
+end
 arch awall_2_1_2
 x 7
-y 31
+y 34
+end
+arch blocked
+x 7
+y 35
 end
 arch magic_banned
 x 8
@@ -2736,7 +3020,7 @@ arch cobblestones2
 x 8
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 8
 y 2
 end
@@ -2748,6 +3032,10 @@ arch cobblestones2
 x 8
 y 3
 end
+arch awall_1_2
+x 8
+y 3
+end
 arch magic_banned
 x 8
 y 4
@@ -2756,44 +3044,44 @@ arch cobblestones2
 x 8
 y 4
 end
+arch magic_banned
+x 8
+y 5
+end
+arch cobblestones2
+x 8
+y 5
+end
+arch magic_banned
+x 8
+y 6
+end
+arch cobblestones2
+x 8
+y 6
+end
+arch magic_banned
+x 8
+y 7
+end
+arch cobblestones2
+x 8
+y 7
+end
 arch chair_1.3
 x 8
-y 4
+y 7
 end
 arch magic_banned
 x 8
-y 5
+y 8
 end
 arch cobblestones2
 x 8
-y 5
+y 8
 end
 arch awall_2_1_2
 x 8
-y 5
-end
-arch magic_banned
-x 8
-y 6
-end
-arch cobblestones2
-x 8
-y 6
-end
-arch magic_banned
-x 8
-y 7
-end
-arch cobblestones2
-x 8
-y 7
-end
-arch magic_banned
-x 8
-y 8
-end
-arch cobblestones2
-x 8
 y 8
 end
 arch magic_banned
@@ -2820,6 +3108,30 @@ arch cobblestones2
 x 8
 y 11
 end
+arch magic_banned
+x 8
+y 12
+end
+arch cobblestones2
+x 8
+y 12
+end
+arch magic_banned
+x 8
+y 13
+end
+arch cobblestones2
+x 8
+y 13
+end
+arch magic_banned
+x 8
+y 14
+end
+arch cobblestones2
+x 8
+y 14
+end
 arch princess
 name waiting princess
 msg
@@ -2830,35 +3142,11 @@ I'm waiting for my brother.
 @reply brother Who is your brother?
 endmsg
 x 8
-y 11
+y 14
 friendly 1
 end
 arch magic_banned
 x 8
-y 12
-end
-arch cobblestones2
-x 8
-y 12
-end
-arch magic_banned
-x 8
-y 13
-end
-arch cobblestones2
-x 8
-y 13
-end
-arch magic_banned
-x 8
-y 14
-end
-arch cobblestones2
-x 8
-y 14
-end
-arch magic_banned
-x 8
 y 15
 end
 arch cobblestones2
@@ -2993,9 +3281,37 @@ arch cobblestones2
 x 8
 y 31
 end
+arch magic_banned
+x 8
+y 32
+end
+arch cobblestones2
+x 8
+y 32
+end
+arch magic_banned
+x 8
+y 33
+end
+arch cobblestones2
+x 8
+y 33
+end
+arch magic_banned
+x 8
+y 34
+end
+arch cobblestones2
+x 8
+y 34
+end
 arch awall_2_1_2
 x 8
-y 31
+y 34
+end
+arch blocked
+x 8
+y 35
 end
 arch magic_banned
 x 9
@@ -3011,11 +3327,11 @@ x 9
 y 1
 end
 arch creator
-slaying Ticket To Wolfsburg
+slaying Ticket To Port Joseph
 other_arch card
 x 9
 y 1
-connected 24
+connected 20
 lifesave 1
 end
 arch cobblestones2
@@ -3028,7 +3344,7 @@ y 2
 end
 arch magic_mouth
 msg
-Drop 750 gold coins to buy a ticket to Wolfsburg.
+Drop 100 gold coins to buy a ticket to Port Joseph.
 endmsg
 x 9
 y 2
@@ -3040,11 +3356,11 @@ end
 arch altar_trigger
 name Ticket Booth
 slaying money
-food 7500
+food 1000
 x 9
 y 2
 last_sp 1
-connected 24
+connected 20
 end
 arch magic_banned
 x 9
@@ -3062,48 +3378,48 @@ arch cobblestones2
 x 9
 y 4
 end
+arch magic_banned
+x 9
+y 5
+end
+arch cobblestones2
+x 9
+y 5
+end
+arch magic_banned
+x 9
+y 6
+end
+arch cobblestones2
+x 9
+y 6
+end
+arch magic_banned
+x 9
+y 7
+end
+arch cobblestones2
+x 9
+y 7
+end
 arch table_2
 x 9
-y 4
+y 7
 end
 arch random_food
 x 9
-y 4
+y 7
 end
 arch magic_banned
 x 9
-y 5
+y 8
 end
 arch cobblestones2
 x 9
-y 5
+y 8
 end
 arch awall_2_1_2
 x 9
-y 5
-end
-arch magic_banned
-x 9
-y 6
-end
-arch cobblestones2
-x 9
-y 6
-end
-arch magic_banned
-x 9
-y 7
-end
-arch cobblestones2
-x 9
-y 7
-end
-arch magic_banned
-x 9
-y 8
-end
-arch cobblestones2
-x 9
 y 8
 end
 arch magic_banned
@@ -3234,6 +3550,30 @@ arch cobblestones2
 x 9
 y 24
 end
+arch magic_banned
+x 9
+y 25
+end
+arch cobblestones2
+x 9
+y 25
+end
+arch magic_banned
+x 9
+y 26
+end
+arch cobblestones2
+x 9
+y 26
+end
+arch magic_banned
+x 9
+y 27
+end
+arch cobblestones2
+x 9
+y 27
+end
 arch man
 name crying man
 msg
@@ -3243,30 +3583,6 @@ Leave me alone.
 You wouldn't understand.
 endmsg
 x 9
-y 24
-end
-arch magic_banned
-x 9
-y 25
-end
-arch cobblestones2
-x 9
-y 25
-end
-arch magic_banned
-x 9
-y 26
-end
-arch cobblestones2
-x 9
-y 26
-end
-arch magic_banned
-x 9
-y 27
-end
-arch cobblestones2
-x 9
 y 27
 end
 arch magic_banned
@@ -3301,9 +3617,37 @@ arch cobblestones2
 x 9
 y 31
 end
+arch magic_banned
+x 9
+y 32
+end
+arch cobblestones2
+x 9
+y 32
+end
+arch magic_banned
+x 9
+y 33
+end
+arch cobblestones2
+x 9
+y 33
+end
+arch magic_banned
+x 9
+y 34
+end
+arch cobblestones2
+x 9
+y 34
+end
 arch awall_2_1_2
 x 9
-y 31
+y 34
+end
+arch blocked
+x 9
+y 35
 end
 arch magic_banned
 x 10
@@ -3334,7 +3678,7 @@ arch cobblestones2
 x 10
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 10
 y 2
 end
@@ -3346,6 +3690,10 @@ arch cobblestones2
 x 10
 y 3
 end
+arch awall_1_2
+x 10
+y 3
+end
 arch magic_banned
 x 10
 y 4
@@ -3354,87 +3702,87 @@ arch cobblestones2
 x 10
 y 4
 end
+arch magic_banned
+x 10
+y 5
+end
+arch cobblestones2
+x 10
+y 5
+end
+arch magic_banned
+x 10
+y 6
+end
+arch cobblestones2
+x 10
+y 6
+end
+arch magic_banned
+x 10
+y 7
+end
+arch cobblestones2
+x 10
+y 7
+end
 arch chair_1.3
 x 10
-y 4
+y 7
 end
 arch magic_banned
 x 10
-y 5
+y 8
 end
 arch cobblestones2
 x 10
-y 5
+y 8
 end
 arch awall_2_1_2
 x 10
-y 5
-end
-arch magic_banned
-x 10
-y 6
-end
-arch cobblestones2
-x 10
-y 6
-end
-arch magic_banned
-x 10
-y 7
-end
-arch cobblestones2
-x 10
-y 7
-end
-arch magic_banned
-x 10
 y 8
 end
+arch magic_banned
+x 10
+y 9
+end
 arch cobblestones2
 x 10
-y 8
+y 9
+end
+arch magic_banned
+x 10
+y 10
+end
+arch cobblestones2
+x 10
+y 10
+end
+arch magic_banned
+x 10
+y 11
+end
+arch cobblestones2
+x 10
+y 11
 end
 arch altar_trigger
 name To Navar
 slaying Ticket To Navar
 food 1
 x 10
-y 8
+y 11
 connected 2
 end
 arch magic_banned
 x 10
-y 9
+y 12
 end
 arch magic_mouth
 msg
 Navar
 endmsg
 x 10
-y 9
-end
-arch cobblestones2
-x 10
-y 9
-end
-arch magic_banned
-x 10
-y 10
-end
-arch cobblestones2
-x 10
-y 10
-end
-arch magic_banned
-x 10
-y 11
-end
-arch cobblestones2
-x 10
-y 11
-end
-arch magic_banned
-x 10
 y 12
 end
 arch cobblestones2
@@ -3457,47 +3805,47 @@ arch cobblestones2
 x 10
 y 14
 end
+arch magic_banned
+x 10
+y 15
+end
+arch cobblestones2
+x 10
+y 15
+end
+arch magic_banned
+x 10
+y 16
+end
+arch cobblestones2
+x 10
+y 16
+end
+arch magic_banned
+x 10
+y 17
+end
+arch cobblestones2
+x 10
+y 17
+end
 arch altar_trigger
 name To Darcap
 slaying Ticket to Darcap
 food 1
 x 10
-y 14
+y 17
 connected 4
 end
 arch magic_banned
 x 10
-y 15
+y 18
 end
 arch magic_mouth
 msg
 Dtabb
 endmsg
 x 10
-y 15
-end
-arch cobblestones2
-x 10
-y 15
-end
-arch magic_banned
-x 10
-y 16
-end
-arch cobblestones2
-x 10
-y 16
-end
-arch magic_banned
-x 10
-y 17
-end
-arch cobblestones2
-x 10
-y 17
-end
-arch magic_banned
-x 10
 y 18
 end
 arch cobblestones2
@@ -3520,47 +3868,47 @@ arch cobblestones2
 x 10
 y 20
 end
+arch magic_banned
+x 10
+y 21
+end
+arch cobblestones2
+x 10
+y 21
+end
+arch magic_banned
+x 10
+y 22
+end
+arch cobblestones2
+x 10
+y 22
+end
+arch magic_banned
+x 10
+y 23
+end
+arch cobblestones2
+x 10
+y 23
+end
 arch altar_trigger
 name Out Of Order
 slaying Out Of Order
 food 1
 x 10
-y 20
+y 23
 connected 6
 end
 arch magic_banned
 x 10
-y 21
+y 24
 end
 arch magic_mouth
 msg
 Out Of Order
 endmsg
 x 10
-y 21
-end
-arch cobblestones2
-x 10
-y 21
-end
-arch magic_banned
-x 10
-y 22
-end
-arch cobblestones2
-x 10
-y 22
-end
-arch magic_banned
-x 10
-y 23
-end
-arch cobblestones2
-x 10
-y 23
-end
-arch magic_banned
-x 10
 y 24
 end
 arch cobblestones2
@@ -3583,47 +3931,47 @@ arch cobblestones2
 x 10
 y 26
 end
+arch magic_banned
+x 10
+y 27
+end
+arch cobblestones2
+x 10
+y 27
+end
+arch magic_banned
+x 10
+y 28
+end
+arch cobblestones2
+x 10
+y 28
+end
+arch magic_banned
+x 10
+y 29
+end
+arch cobblestones2
+x 10
+y 29
+end
 arch altar_trigger
 name Out Of Order
 slaying Out Of Order
 food 1
 x 10
-y 26
+y 29
 connected 8
 end
 arch magic_banned
 x 10
-y 27
+y 30
 end
 arch magic_mouth
 msg
 Out Of Order
 endmsg
 x 10
-y 27
-end
-arch cobblestones2
-x 10
-y 27
-end
-arch magic_banned
-x 10
-y 28
-end
-arch cobblestones2
-x 10
-y 28
-end
-arch magic_banned
-x 10
-y 29
-end
-arch cobblestones2
-x 10
-y 29
-end
-arch magic_banned
-x 10
 y 30
 end
 arch cobblestones2
@@ -3638,9 +3986,37 @@ arch cobblestones2
 x 10
 y 31
 end
+arch magic_banned
+x 10
+y 32
+end
+arch cobblestones2
+x 10
+y 32
+end
+arch magic_banned
+x 10
+y 33
+end
+arch cobblestones2
+x 10
+y 33
+end
+arch magic_banned
+x 10
+y 34
+end
+arch cobblestones2
+x 10
+y 34
+end
 arch awall_2_1_2
 x 10
-y 31
+y 34
+end
+arch blocked
+x 10
+y 35
 end
 arch magic_banned
 x 11
@@ -3656,11 +4032,11 @@ x 11
 y 1
 end
 arch creator
-slaying Ticket To Brest
+slaying Ticket To Wolfsburg
 other_arch card
 x 11
 y 1
-connected 25
+connected 24
 lifesave 1
 end
 arch cobblestones2
@@ -3673,7 +4049,7 @@ y 2
 end
 arch magic_mouth
 msg
-Drop 1000 gold coins to buy a ticket to Brest.
+Drop 750 gold coins to buy a ticket to Wolfsburg.
 endmsg
 x 11
 y 2
@@ -3685,11 +4061,11 @@ end
 arch altar_trigger
 name Ticket Booth
 slaying money
-food 10000
+food 7500
 x 11
 y 2
 last_sp 1
-connected 25
+connected 24
 end
 arch magic_banned
 x 11
@@ -3707,305 +4083,333 @@ arch cobblestones2
 x 11
 y 4
 end
+arch magic_banned
+x 11
+y 5
+end
+arch cobblestones2
+x 11
+y 5
+end
+arch magic_banned
+x 11
+y 6
+end
+arch cobblestones2
+x 11
+y 6
+end
+arch magic_banned
+x 11
+y 7
+end
+arch cobblestones2
+x 11
+y 7
+end
 arch table_2
 x 11
-y 4
+y 7
 end
 arch random_food
 x 11
-y 4
+y 7
 end
 arch magic_banned
 x 11
-y 5
+y 8
 end
 arch cobblestones2
 x 11
-y 5
+y 8
 end
 arch awall_2_1_2
 x 11
-y 5
+y 8
 end
 arch magic_banned
 x 11
-y 6
+y 9
 end
 arch cobblestones2
 x 11
-y 6
+y 9
 end
 arch magic_banned
 x 11
-y 7
+y 10
 end
 arch cobblestones2
 x 11
-y 7
+y 10
 end
 arch swall_2_2_2
 x 11
-y 7
+y 10
 end
 arch magic_banned
 x 11
-y 8
+y 11
 end
 arch cobblestones2
 x 11
-y 8
+y 11
 end
 arch swall_1_2
 x 11
-y 8
+y 11
 end
 arch magic_banned
 x 11
-y 9
+y 12
 end
 arch cobblestones2
 x 11
-y 9
+y 12
 end
 arch grate_closed_2
 x 11
-y 9
+y 12
 connected 2
 end
 arch magic_banned
 x 11
-y 10
+y 13
 end
 arch cobblestones2
 x 11
-y 10
+y 13
 end
 arch swall_1_4
 x 11
-y 10
-end
-arch magic_banned
-x 11
-y 11
-end
-arch cobblestones2
-x 11
-y 11
-end
-arch magic_banned
-x 11
-y 12
-end
-arch cobblestones2
-x 11
-y 12
-end
-arch magic_banned
-x 11
 y 13
 end
+arch magic_banned
+x 11
+y 14
+end
 arch cobblestones2
 x 11
-y 13
+y 14
+end
+arch magic_banned
+x 11
+y 15
+end
+arch cobblestones2
+x 11
+y 15
+end
+arch magic_banned
+x 11
+y 16
+end
+arch cobblestones2
+x 11
+y 16
 end
 arch swall_2_2_2
 x 11
-y 13
+y 16
 end
 arch magic_banned
 x 11
-y 14
+y 17
 end
 arch cobblestones2
 x 11
-y 14
+y 17
 end
 arch swall_1_2
 x 11
-y 14
+y 17
 end
 arch magic_banned
 x 11
-y 15
+y 18
 end
 arch cobblestones2
 x 11
-y 15
+y 18
 end
 arch grate_closed_2
 x 11
-y 15
+y 18
 connected 4
 end
 arch magic_banned
 x 11
-y 16
+y 19
 end
 arch cobblestones2
 x 11
-y 16
+y 19
 end
 arch swall_1_4
 x 11
-y 16
-end
-arch magic_banned
-x 11
-y 17
-end
-arch cobblestones2
-x 11
-y 17
-end
-arch magic_banned
-x 11
-y 18
-end
-arch cobblestones2
-x 11
-y 18
-end
-arch magic_banned
-x 11
 y 19
 end
+arch magic_banned
+x 11
+y 20
+end
 arch cobblestones2
 x 11
-y 19
+y 20
+end
+arch magic_banned
+x 11
+y 21
+end
+arch cobblestones2
+x 11
+y 21
+end
+arch magic_banned
+x 11
+y 22
+end
+arch cobblestones2
+x 11
+y 22
 end
 arch swall_2_2_2
 x 11
-y 19
+y 22
 end
 arch magic_banned
 x 11
-y 20
+y 23
 end
 arch cobblestones2
 x 11
-y 20
+y 23
 end
 arch swall_1_2
 x 11
-y 20
+y 23
 end
 arch magic_banned
 x 11
-y 21
+y 24
 end
 arch cobblestones2
 x 11
-y 21
+y 24
 end
 arch grate_closed_2
 x 11
-y 21
+y 24
 connected 6
 end
 arch magic_banned
 x 11
-y 22
+y 25
 end
 arch cobblestones2
 x 11
-y 22
+y 25
 end
 arch swall_1_4
 x 11
-y 22
-end
-arch magic_banned
-x 11
-y 23
-end
-arch cobblestones2
-x 11
-y 23
-end
-arch magic_banned
-x 11
-y 24
-end
-arch cobblestones2
-x 11
-y 24
-end
-arch magic_banned
-x 11
 y 25
 end
+arch magic_banned
+x 11
+y 26
+end
 arch cobblestones2
 x 11
-y 25
+y 26
+end
+arch magic_banned
+x 11
+y 27
+end
+arch cobblestones2
+x 11
+y 27
+end
+arch magic_banned
+x 11
+y 28
+end
+arch cobblestones2
+x 11
+y 28
 end
 arch swall_2_2_2
 x 11
-y 25
+y 28
 end
 arch magic_banned
 x 11
-y 26
+y 29
 end
 arch cobblestones2
 x 11
-y 26
+y 29
 end
 arch swall_1_2
 x 11
-y 26
+y 29
 end
 arch magic_banned
 x 11
-y 27
+y 30
 end
 arch cobblestones2
 x 11
-y 27
+y 30
 end
 arch grate_closed_2
 x 11
-y 27
+y 30
 connected 8
 end
 arch magic_banned
 x 11
-y 28
+y 31
 end
 arch cobblestones2
 x 11
-y 28
+y 31
 end
 arch swall_1_4
 x 11
-y 28
-end
-arch magic_banned
-x 11
-y 29
-end
-arch cobblestones2
-x 11
-y 29
-end
-arch magic_banned
-x 11
-y 30
-end
-arch cobblestones2
-x 11
-y 30
-end
-arch magic_banned
-x 11
 y 31
 end
+arch magic_banned
+x 11
+y 32
+end
 arch cobblestones2
 x 11
-y 31
+y 32
+end
+arch magic_banned
+x 11
+y 33
+end
+arch cobblestones2
+x 11
+y 33
+end
+arch magic_banned
+x 11
+y 34
+end
+arch cobblestones2
+x 11
+y 34
 end
 arch awall_2_1_2
 x 11
-y 31
+y 34
+end
+arch blocked
+x 11
+y 35
 end
 arch magic_banned
 x 12
@@ -4057,6 +4461,30 @@ arch cobblestones2
 x 12
 y 4
 end
+arch magic_banned
+x 12
+y 5
+end
+arch cobblestones2
+x 12
+y 5
+end
+arch magic_banned
+x 12
+y 6
+end
+arch cobblestones2
+x 12
+y 6
+end
+arch magic_banned
+x 12
+y 7
+end
+arch cobblestones2
+x 12
+y 7
+end
 arch guildmaster
 name old man
 msg
@@ -4064,50 +4492,50 @@ msg
 You can pay your ticket with either platinum, gold, or silver coins.
 endmsg
 x 12
-y 4
+y 7
 randomitems standard
 friendly 1
 unaggressive 0
 end
 arch magic_banned
 x 12
-y 5
+y 8
 end
 arch cobblestones2
 x 12
-y 5
+y 8
 end
 arch awall_2_1_2
 x 12
-y 5
+y 8
 end
 arch magic_banned
 x 12
-y 6
+y 9
 end
 arch cobblestones2
 x 12
-y 6
+y 9
 end
 arch magic_banned
 x 12
-y 7
+y 10
 end
 arch cobblestones2
 x 12
-y 7
+y 10
 end
 arch swall_2_1_2
 x 12
-y 7
+y 10
 end
 arch magic_banned
 x 12
-y 8
+y 11
 end
 arch cobblestones2
 x 12
-y 8
+y 11
 end
 arch dragon_exit
 name dragon express
@@ -4118,34 +4546,6 @@ endmsg
 hp 37
 sp 46
 x 12
-y 8
-end
-arch magic_banned
-x 12
-y 9
-end
-arch cobblestones2
-x 12
-y 9
-end
-arch magic_banned
-x 12
-y 10
-end
-arch cobblestones2
-x 12
-y 10
-end
-arch swall_2_1_2
-x 12
-y 10
-end
-arch magic_banned
-x 12
-y 11
-end
-arch cobblestones2
-x 12
 y 11
 end
 arch magic_banned
@@ -4176,6 +4576,34 @@ arch cobblestones2
 x 12
 y 14
 end
+arch magic_banned
+x 12
+y 15
+end
+arch cobblestones2
+x 12
+y 15
+end
+arch magic_banned
+x 12
+y 16
+end
+arch cobblestones2
+x 12
+y 16
+end
+arch swall_2_1_2
+x 12
+y 16
+end
+arch magic_banned
+x 12
+y 17
+end
+arch cobblestones2
+x 12
+y 17
+end
 arch dragon_exit
 name dragon express
 slaying /world/world_116_102
@@ -4185,34 +4613,6 @@ endmsg
 hp 29
 sp 37
 x 12
-y 14
-end
-arch magic_banned
-x 12
-y 15
-end
-arch cobblestones2
-x 12
-y 15
-end
-arch magic_banned
-x 12
-y 16
-end
-arch cobblestones2
-x 12
-y 16
-end
-arch swall_2_1_2
-x 12
-y 16
-end
-arch magic_banned
-x 12
-y 17
-end
-arch cobblestones2
-x 12
 y 17
 end
 arch magic_banned
@@ -4243,14 +4643,6 @@ arch cobblestones2
 x 12
 y 20
 end
-arch dragon_exit
-name dragon express
-msg
-Please hurry up or we will be moving without you.
-endmsg
-x 12
-y 20
-end
 arch magic_banned
 x 12
 y 21
@@ -4279,6 +4671,14 @@ arch cobblestones2
 x 12
 y 23
 end
+arch dragon_exit
+name dragon express
+msg
+Please hurry up or we will be moving without you.
+endmsg
+x 12
+y 23
+end
 arch magic_banned
 x 12
 y 24
@@ -4307,61 +4707,93 @@ arch cobblestones2
 x 12
 y 26
 end
+arch magic_banned
+x 12
+y 27
+end
+arch cobblestones2
+x 12
+y 27
+end
+arch magic_banned
+x 12
+y 28
+end
+arch cobblestones2
+x 12
+y 28
+end
+arch swall_2_1_2
+x 12
+y 28
+end
+arch magic_banned
+x 12
+y 29
+end
+arch cobblestones2
+x 12
+y 29
+end
 arch dragon_exit
 name dragon express
 msg
 Please hurry up or we will be moving without you.
 endmsg
 x 12
-y 26
+y 29
 end
 arch magic_banned
 x 12
-y 27
+y 30
 end
 arch cobblestones2
 x 12
-y 27
+y 30
 end
 arch magic_banned
 x 12
-y 28
+y 31
 end
 arch cobblestones2
 x 12
-y 28
+y 31
 end
 arch swall_2_1_2
 x 12
-y 28
-end
-arch magic_banned
-x 12
-y 29
-end
-arch cobblestones2
-x 12
-y 29
-end
-arch magic_banned
-x 12
-y 30
-end
-arch cobblestones2
-x 12
-y 30
-end
-arch magic_banned
-x 12
 y 31
 end
+arch magic_banned
+x 12
+y 32
+end
 arch cobblestones2
 x 12
-y 31
+y 32
+end
+arch magic_banned
+x 12
+y 33
+end
+arch cobblestones2
+x 12
+y 33
+end
+arch magic_banned
+x 12
+y 34
+end
+arch cobblestones2
+x 12
+y 34
 end
 arch awall_2_1_2
 x 12
-y 31
+y 34
+end
+arch blocked
+x 12
+y 35
 end
 arch magic_banned
 x 13
@@ -4380,7 +4812,7 @@ arch cobblestones2
 x 13
 y 1
 end
-arch awall_1_2
+arch awall_2_1_1
 x 13
 y 1
 end
@@ -4392,73 +4824,81 @@ arch cobblestones2
 x 13
 y 2
 end
-arch door_look_2
+arch awall_2_1_1
 x 13
 y 2
+end
+arch magic_banned
+x 13
+y 3
+end
+arch cobblestones2
+x 13
+y 3
+end
+arch awall_2_1_1
+x 13
+y 3
+end
+arch magic_banned
+x 13
+y 4
+end
+arch cobblestones2
+x 13
+y 4
+end
+arch awall_1_2
+x 13
+y 4
+end
+arch magic_banned
+x 13
+y 5
+end
+arch cobblestones2
+x 13
+y 5
+end
+arch door_look_2
+x 13
+y 5
 move_block 0
 end
 arch magic_banned
 x 13
-y 3
+y 6
 end
 arch cobblestones2
 x 13
-y 3
+y 6
 end
 arch awall_1_1
 x 13
-y 3
+y 6
 end
 arch magic_banned
 x 13
-y 4
+y 7
 end
 arch cobblestones2
 x 13
-y 4
+y 7
 end
 arch awall_2_1_1
 x 13
-y 4
+y 7
 end
 arch magic_banned
 x 13
-y 5
+y 8
 end
 arch cobblestones2
 x 13
-y 5
+y 8
 end
 arch awall_2_2_4
 x 13
-y 5
-end
-arch magic_banned
-x 13
-y 6
-end
-arch cobblestones2
-x 13
-y 6
-end
-arch magic_banned
-x 13
-y 7
-end
-arch cobblestones2
-x 13
-y 7
-end
-arch swall_2_1_2
-x 13
-y 7
-end
-arch magic_banned
-x 13
-y 8
-end
-arch cobblestones2
-x 13
 y 8
 end
 arch magic_banned
@@ -4673,9 +5113,41 @@ arch cobblestones2
 x 13
 y 31
 end
+arch swall_2_1_2
+x 13
+y 31
+end
+arch magic_banned
+x 13
+y 32
+end
+arch cobblestones2
+x 13
+y 32
+end
+arch magic_banned
+x 13
+y 33
+end
+arch cobblestones2
+x 13
+y 33
+end
+arch magic_banned
+x 13
+y 34
+end
+arch cobblestones2
+x 13
+y 34
+end
 arch awall_2_1_2
 x 13
-y 31
+y 34
+end
+arch blocked
+x 13
+y 35
 end
 arch magic_banned
 x 14
@@ -4709,85 +5181,96 @@ arch magic_banned
 x 14
 y 3
 end
+arch button_trigger
+x 14
+y 3
+connected 99
+end
 arch cobblestones2
 x 14
 y 3
 end
+arch magic_banned
+x 14
+y 4
+end
+arch button_trigger
+x 14
+y 4
+connected 99
+end
+arch cobblestones2
+x 14
+y 4
+end
+arch magic_banned
+x 14
+y 5
+end
+arch button_trigger
+x 14
+y 5
+connected 99
+end
+arch cobblestones2
+x 14
+y 5
+end
+arch magic_banned
+x 14
+y 6
+end
+arch cobblestones2
+x 14
+y 6
+end
 arch guard
 name guard
 x 14
-y 3
+y 6
 friendly 1
 unaggressive 0
 end
 arch magic_banned
 x 14
-y 4
+y 7
 end
 arch check_inv
 race booze
 slaying 0
 x 14
-y 4
+y 7
 last_sp 0
 connected 99
 end
 arch cobblestones2
 x 14
-y 4
+y 7
 end
 arch magic_banned
 x 14
-y 5
+y 8
 end
 arch cobblestones2
 x 14
-y 5
+y 8
 end
 arch igateTrg1
 x 14
-y 5
+y 8
 connected 99
 end
 arch magic_banned
 x 14
-y 6
+y 9
 end
 arch button_trigger
 x 14
-y 6
+y 9
 connected 99
 end
 arch cobblestones2
 x 14
-y 6
-end
-arch magic_banned
-x 14
-y 7
-end
-arch cobblestones2
-x 14
-y 7
-end
-arch swall_2_1_2
-x 14
-y 7
-end
-arch magic_banned
-x 14
-y 8
-end
-arch cobblestones2
-x 14
-y 8
-end
-arch magic_banned
-x 14
-y 9
-end
-arch cobblestones2
-x 14
 y 9
 end
 arch magic_banned
@@ -4874,13 +5357,41 @@ arch cobblestones2
 x 14
 y 18
 end
+arch magic_banned
+x 14
+y 19
+end
+arch cobblestones2
+x 14
+y 19
+end
+arch swall_2_1_2
+x 14
+y 19
+end
+arch magic_banned
+x 14
+y 20
+end
+arch cobblestones2
+x 14
+y 20
+end
+arch magic_banned
+x 14
+y 21
+end
+arch cobblestones2
+x 14
+y 21
+end
 arch beggar
 msg
 @match *
 A penny for a poor beggar?
 endmsg
 x 14
-y 18
+y 21
 can_use_range 0
 can_use_bow 0
 can_use_armour 0
@@ -4890,34 +5401,6 @@ can_use_skill 0
 end
 arch magic_banned
 x 14
-y 19
-end
-arch cobblestones2
-x 14
-y 19
-end
-arch swall_2_1_2
-x 14
-y 19
-end
-arch magic_banned
-x 14
-y 20
-end
-arch cobblestones2
-x 14
-y 20
-end
-arch magic_banned
-x 14
-y 21
-end
-arch cobblestones2
-x 14
-y 21
-end
-arch magic_banned
-x 14
 y 22
 end
 arch cobblestones2
@@ -5008,9 +5491,41 @@ arch cobblestones2
 x 14
 y 31
 end
+arch swall_2_1_2
+x 14
+y 31
+end
+arch magic_banned
+x 14
+y 32
+end
+arch cobblestones2
+x 14
+y 32
+end
+arch magic_banned
+x 14
+y 33
+end
+arch cobblestones2
+x 14
+y 33
+end
+arch magic_banned
+x 14
+y 34
+end
+arch cobblestones2
+x 14
+y 34
+end
 arch awall_2_1_2
 x 14
-y 31
+y 34
+end
+arch blocked
+x 14
+y 35
 end
 arch magic_banned
 x 15
@@ -5044,6 +5559,11 @@ arch magic_banned
 x 15
 y 3
 end
+arch button_trigger
+x 15
+y 3
+connected 99
+end
 arch cobblestones2
 x 15
 y 3
@@ -5052,90 +5572,88 @@ arch magic_banned
 x 15
 y 4
 end
+arch button_trigger
+x 15
+y 4
+connected 99
+end
+arch cobblestones2
+x 15
+y 4
+end
+arch magic_banned
+x 15
+y 5
+end
+arch button_trigger
+x 15
+y 5
+connected 99
+end
+arch cobblestones2
+x 15
+y 5
+end
+arch magic_banned
+x 15
+y 6
+end
+arch cobblestones2
+x 15
+y 6
+end
+arch magic_banned
+x 15
+y 7
+end
 arch check_inv
 race booze
 slaying 0
 x 15
-y 4
+y 7
 last_sp 0
 connected 99
 end
 arch cobblestones2
 x 15
-y 4
+y 7
 end
 arch magic_banned
 x 15
-y 5
+y 8
 end
 arch cobblestones2
 x 15
-y 5
+y 8
 end
 arch igateTrg1
 x 15
-y 5
+y 8
 connected 99
 end
 arch magic_banned
 x 15
-y 6
+y 9
 end
 arch button_trigger
 x 15
-y 6
+y 9
 connected 99
 end
 arch cobblestones2
 x 15
-y 6
+y 9
 end
 arch magic_banned
 x 15
-y 7
+y 10
 end
 arch cobblestones2
 x 15
-y 7
+y 10
 end
 arch swall_2_2_3
 x 15
-y 7
-end
-arch magic_banned
-x 15
-y 8
-end
-arch cobblestones2
-x 15
-y 8
-end
-arch swall_2_1_1
-x 15
-y 8
-end
-arch magic_banned
-x 15
-y 9
-end
-arch cobblestones2
-x 15
-y 9
-end
-arch swall_2_1_1
-x 15
-y 9
-end
-arch magic_banned
-x 15
-y 10
-end
-arch cobblestones2
-x 15
-y 10
-end
-arch swall_2_2_4
-x 15
 y 10
 end
 arch magic_banned
@@ -5146,6 +5664,10 @@ arch cobblestones2
 x 15
 y 11
 end
+arch swall_2_1_1
+x 15
+y 11
+end
 arch magic_banned
 x 15
 y 12
@@ -5154,6 +5676,10 @@ arch cobblestones2
 x 15
 y 12
 end
+arch swall_2_1_1
+x 15
+y 12
+end
 arch magic_banned
 x 15
 y 13
@@ -5162,7 +5688,7 @@ arch cobblestones2
 x 15
 y 13
 end
-arch swall_2_2_3
+arch swall_2_2_4
 x 15
 y 13
 end
@@ -5174,10 +5700,6 @@ arch cobblestones2
 x 15
 y 14
 end
-arch swall_2_1_1
-x 15
-y 14
-end
 arch magic_banned
 x 15
 y 15
@@ -5186,10 +5708,6 @@ arch cobblestones2
 x 15
 y 15
 end
-arch swall_2_1_1
-x 15
-y 15
-end
 arch magic_banned
 x 15
 y 16
@@ -5198,7 +5716,7 @@ arch cobblestones2
 x 15
 y 16
 end
-arch swall_2_2_4
+arch swall_2_2_3
 x 15
 y 16
 end
@@ -5210,6 +5728,10 @@ arch cobblestones2
 x 15
 y 17
 end
+arch swall_2_1_1
+x 15
+y 17
+end
 arch magic_banned
 x 15
 y 18
@@ -5218,6 +5740,10 @@ arch cobblestones2
 x 15
 y 18
 end
+arch swall_2_1_1
+x 15
+y 18
+end
 arch magic_banned
 x 15
 y 19
@@ -5226,7 +5752,7 @@ arch cobblestones2
 x 15
 y 19
 end
-arch swall_2_2_3
+arch swall_2_2_4
 x 15
 y 19
 end
@@ -5238,10 +5764,6 @@ arch cobblestones2
 x 15
 y 20
 end
-arch swall_2_1_1
-x 15
-y 20
-end
 arch magic_banned
 x 15
 y 21
@@ -5250,10 +5772,6 @@ arch cobblestones2
 x 15
 y 21
 end
-arch swall_2_1_1
-x 15
-y 21
-end
 arch magic_banned
 x 15
 y 22
@@ -5262,36 +5780,44 @@ arch cobblestones2
 x 15
 y 22
 end
-arch swall_2_2_4
-x 15
-y 22
-end
-arch magic_banned
-x 15
-y 23
-end
-arch cobblestones2
-x 15
-y 23
-end
-arch magic_banned
-x 15
-y 24
-end
-arch cobblestones2
-x 15
-y 24
-end
-arch magic_banned
-x 15
-y 25
-end
-arch cobblestones2
-x 15
-y 25
-end
 arch swall_2_2_3
 x 15
+y 22
+end
+arch magic_banned
+x 15
+y 23
+end
+arch cobblestones2
+x 15
+y 23
+end
+arch swall_2_1_1
+x 15
+y 23
+end
+arch magic_banned
+x 15
+y 24
+end
+arch cobblestones2
+x 15
+y 24
+end
+arch swall_2_1_1
+x 15
+y 24
+end
+arch magic_banned
+x 15
+y 25
+end
+arch cobblestones2
+x 15
+y 25
+end
+arch swall_2_2_4
+x 15
 y 25
 end
 arch magic_banned
@@ -5302,10 +5828,6 @@ arch cobblestones2
 x 15
 y 26
 end
-arch swall_2_1_1
-x 15
-y 26
-end
 arch magic_banned
 x 15
 y 27
@@ -5314,10 +5836,6 @@ arch cobblestones2
 x 15
 y 27
 end
-arch swall_2_1_1
-x 15
-y 27
-end
 arch magic_banned
 x 15
 y 28
@@ -5326,32 +5844,68 @@ arch cobblestones2
 x 15
 y 28
 end
+arch swall_2_2_3
+x 15
+y 28
+end
+arch magic_banned
+x 15
+y 29
+end
+arch cobblestones2
+x 15
+y 29
+end
+arch swall_2_1_1
+x 15
+y 29
+end
+arch magic_banned
+x 15
+y 30
+end
+arch cobblestones2
+x 15
+y 30
+end
+arch swall_2_1_1
+x 15
+y 30
+end
+arch magic_banned
+x 15
+y 31
+end
+arch cobblestones2
+x 15
+y 31
+end
 arch swall_2_2_4
 x 15
-y 28
+y 31
 end
 arch magic_banned
 x 15
-y 29
+y 32
 end
 arch cobblestones2
 x 15
-y 29
+y 32
 end
 arch magic_banned
 x 15
-y 30
+y 33
 end
 arch cobblestones2
 x 15
-y 30
+y 33
 end
 arch stair_down_2
 slaying hangar2
 hp 15
 sp 30
 x 15
-y 30
+y 33
 end
 arch light_guard
 name security guard
@@ -5360,19 +5914,23 @@ msg
 Authorized personnel only beyond this point.
 endmsg
 x 15
-y 30
+y 33
 end
 arch magic_banned
 x 15
-y 31
+y 34
 end
 arch cobblestones2
 x 15
-y 31
+y 34
 end
 arch awall_2_1_2
 x 15
-y 31
+y 34
+end
+arch blocked
+x 15
+y 35
 end
 arch magic_banned
 x 16
@@ -5406,6 +5964,11 @@ arch magic_banned
 x 16
 y 3
 end
+arch button_trigger
+x 16
+y 3
+connected 99
+end
 arch cobblestones2
 x 16
 y 3
@@ -5414,90 +5977,88 @@ arch magic_banned
 x 16
 y 4
 end
+arch button_trigger
+x 16
+y 4
+connected 99
+end
+arch cobblestones2
+x 16
+y 4
+end
+arch magic_banned
+x 16
+y 5
+end
+arch button_trigger
+x 16
+y 5
+connected 99
+end
+arch cobblestones2
+x 16
+y 5
+end
+arch magic_banned
+x 16
+y 6
+end
+arch cobblestones2
+x 16
+y 6
+end
+arch magic_banned
+x 16
+y 7
+end
 arch check_inv
 race booze
 slaying 0
 x 16
-y 4
+y 7
 last_sp 0
 connected 99
 end
 arch cobblestones2
 x 16
-y 4
+y 7
 end
 arch magic_banned
 x 16
-y 5
+y 8
 end
 arch cobblestones2
 x 16
-y 5
+y 8
 end
 arch igateTrg1
 x 16
-y 5
+y 8
 connected 99
 end
 arch magic_banned
 x 16
-y 6
+y 9
 end
 arch button_trigger
 x 16
-y 6
+y 9
 connected 99
 end
 arch cobblestones2
 x 16
-y 6
+y 9
 end
 arch magic_banned
 x 16
-y 7
+y 10
 end
 arch cobblestones2
 x 16
-y 7
+y 10
 end
 arch swall_2_2_2
 x 16
-y 7
-end
-arch magic_banned
-x 16
-y 8
-end
-arch cobblestones2
-x 16
-y 8
-end
-arch swall_2_1_1
-x 16
-y 8
-end
-arch magic_banned
-x 16
-y 9
-end
-arch cobblestones2
-x 16
-y 9
-end
-arch swall_2_1_1
-x 16
-y 9
-end
-arch magic_banned
-x 16
-y 10
-end
-arch cobblestones2
-x 16
-y 10
-end
-arch swall_2_2_1
-x 16
 y 10
 end
 arch magic_banned
@@ -5508,6 +6069,10 @@ arch cobblestones2
 x 16
 y 11
 end
+arch swall_2_1_1
+x 16
+y 11
+end
 arch magic_banned
 x 16
 y 12
@@ -5516,6 +6081,10 @@ arch cobblestones2
 x 16
 y 12
 end
+arch swall_2_1_1
+x 16
+y 12
+end
 arch magic_banned
 x 16
 y 13
@@ -5524,7 +6093,7 @@ arch cobblestones2
 x 16
 y 13
 end
-arch swall_2_2_2
+arch swall_2_2_1
 x 16
 y 13
 end
@@ -5536,10 +6105,6 @@ arch cobblestones2
 x 16
 y 14
 end
-arch swall_2_1_1
-x 16
-y 14
-end
 arch magic_banned
 x 16
 y 15
@@ -5548,10 +6113,6 @@ arch cobblestones2
 x 16
 y 15
 end
-arch swall_2_1_1
-x 16
-y 15
-end
 arch magic_banned
 x 16
 y 16
@@ -5560,7 +6121,7 @@ arch cobblestones2
 x 16
 y 16
 end
-arch swall_2_2_1
+arch swall_2_2_2
 x 16
 y 16
 end
@@ -5572,6 +6133,10 @@ arch cobblestones2
 x 16
 y 17
 end
+arch swall_2_1_1
+x 16
+y 17
+end
 arch magic_banned
 x 16
 y 18
@@ -5580,6 +6145,10 @@ arch cobblestones2
 x 16
 y 18
 end
+arch swall_2_1_1
+x 16
+y 18
+end
 arch magic_banned
 x 16
 y 19
@@ -5588,7 +6157,7 @@ arch cobblestones2
 x 16
 y 19
 end
-arch swall_2_2_2
+arch swall_2_2_1
 x 16
 y 19
 end
@@ -5600,10 +6169,6 @@ arch cobblestones2
 x 16
 y 20
 end
-arch swall_2_1_1
-x 16
-y 20
-end
 arch magic_banned
 x 16
 y 21
@@ -5612,10 +6177,6 @@ arch cobblestones2
 x 16
 y 21
 end
-arch swall_2_1_1
-x 16
-y 21
-end
 arch magic_banned
 x 16
 y 22
@@ -5624,36 +6185,44 @@ arch cobblestones2
 x 16
 y 22
 end
-arch swall_2_2_1
-x 16
-y 22
-end
-arch magic_banned
-x 16
-y 23
-end
-arch cobblestones2
-x 16
-y 23
-end
-arch magic_banned
-x 16
-y 24
-end
-arch cobblestones2
-x 16
-y 24
-end
-arch magic_banned
-x 16
-y 25
-end
-arch cobblestones2
-x 16
-y 25
-end
 arch swall_2_2_2
 x 16
+y 22
+end
+arch magic_banned
+x 16
+y 23
+end
+arch cobblestones2
+x 16
+y 23
+end
+arch swall_2_1_1
+x 16
+y 23
+end
+arch magic_banned
+x 16
+y 24
+end
+arch cobblestones2
+x 16
+y 24
+end
+arch swall_2_1_1
+x 16
+y 24
+end
+arch magic_banned
+x 16
+y 25
+end
+arch cobblestones2
+x 16
+y 25
+end
+arch swall_2_2_1
+x 16
 y 25
 end
 arch magic_banned
@@ -5664,10 +6233,6 @@ arch cobblestones2
 x 16
 y 26
 end
-arch swall_2_1_1
-x 16
-y 26
-end
 arch magic_banned
 x 16
 y 27
@@ -5676,10 +6241,6 @@ arch cobblestones2
 x 16
 y 27
 end
-arch swall_2_1_1
-x 16
-y 27
-end
 arch magic_banned
 x 16
 y 28
@@ -5688,32 +6249,68 @@ arch cobblestones2
 x 16
 y 28
 end
+arch swall_2_2_2
+x 16
+y 28
+end
+arch magic_banned
+x 16
+y 29
+end
+arch cobblestones2
+x 16
+y 29
+end
+arch swall_2_1_1
+x 16
+y 29
+end
+arch magic_banned
+x 16
+y 30
+end
+arch cobblestones2
+x 16
+y 30
+end
+arch swall_2_1_1
+x 16
+y 30
+end
+arch magic_banned
+x 16
+y 31
+end
+arch cobblestones2
+x 16
+y 31
+end
 arch swall_2_2_1
 x 16
-y 28
+y 31
 end
 arch magic_banned
 x 16
-y 29
+y 32
 end
 arch cobblestones2
 x 16
-y 29
+y 32
 end
 arch magic_banned
 x 16
-y 30
+y 33
 end
 arch cobblestones2
 x 16
-y 30
+y 33
 end
 arch stair_down_4
 slaying hangar2
 hp 16
 sp 30
 x 16
-y 30
+y 33
 end
 arch light_guard
 name security guard
@@ -5722,19 +6319,23 @@ msg
 Authorized personnel only beyond this point.
 endmsg
 x 16
-y 30
+y 33
 end
 arch magic_banned
 x 16
-y 31
+y 34
 end
 arch cobblestones2
 x 16
-y 31
+y 34
 end
 arch awall_2_1_2
 x 16
-y 31
+y 34
+end
+arch blocked
+x 16
+y 35
 end
 arch magic_banned
 x 17
@@ -5768,78 +6369,117 @@ arch magic_banned
 x 17
 y 3
 end
+arch button_trigger
+x 17
+y 3
+connected 99
+end
 arch cobblestones2
 x 17
 y 3
 end
+arch magic_banned
+x 17
+y 4
+end
+arch button_trigger
+x 17
+y 4
+connected 99
+end
+arch cobblestones2
+x 17
+y 4
+end
+arch magic_banned
+x 17
+y 5
+end
+arch button_trigger
+x 17
+y 5
+connected 99
+end
+arch cobblestones2
+x 17
+y 5
+end
+arch magic_banned
+x 17
+y 6
+end
+arch cobblestones2
+x 17
+y 6
+end
 arch guard
 name guard
 x 17
-y 3
+y 6
 friendly 1
 unaggressive 0
 end
 arch magic_banned
 x 17
-y 4
+y 7
 end
 arch check_inv
 race booze
 slaying 0
 x 17
-y 4
+y 7
 last_sp 0
 connected 99
 end
 arch cobblestones2
 x 17
-y 4
+y 7
 end
 arch magic_banned
 x 17
-y 5
+y 8
 end
 arch cobblestones2
 x 17
-y 5
+y 8
 end
 arch igateTrg1
 x 17
-y 5
+y 8
 connected 99
 end
 arch magic_banned
 x 17
-y 6
+y 9
 end
 arch button_trigger
 x 17
-y 6
+y 9
 connected 99
 end
 arch cobblestones2
 x 17
-y 6
+y 9
 end
 arch magic_banned
 x 17
-y 7
+y 10
 end
 arch cobblestones2
 x 17
-y 7
+y 10
 end
 arch swall_2_1_2
 x 17
-y 7
+y 10
 end
 arch magic_banned
 x 17
-y 8
+y 11
 end
 arch cobblestones2
 x 17
-y 8
+y 11
 end
 arch dragon_exit
 name dragon express
@@ -5850,34 +6490,6 @@ endmsg
 hp 22
 sp 11
 x 17
-y 8
-end
-arch magic_banned
-x 17
-y 9
-end
-arch cobblestones2
-x 17
-y 9
-end
-arch magic_banned
-x 17
-y 10
-end
-arch cobblestones2
-x 17
-y 10
-end
-arch swall_2_1_2
-x 17
-y 10
-end
-arch magic_banned
-x 17
-y 11
-end
-arch cobblestones2
-x 17
 y 11
 end
 arch magic_banned
@@ -5908,6 +6520,34 @@ arch cobblestones2
 x 17
 y 14
 end
+arch magic_banned
+x 17
+y 15
+end
+arch cobblestones2
+x 17
+y 15
+end
+arch magic_banned
+x 17
+y 16
+end
+arch cobblestones2
+x 17
+y 16
+end
+arch swall_2_1_2
+x 17
+y 16
+end
+arch magic_banned
+x 17
+y 17
+end
+arch cobblestones2
+x 17
+y 17
+end
 arch dragon_exit
 name dragon express
 slaying /world/world_105_115
@@ -5917,34 +6557,6 @@ endmsg
 hp 5
 sp 37
 x 17
-y 14
-end
-arch magic_banned
-x 17
-y 15
-end
-arch cobblestones2
-x 17
-y 15
-end
-arch magic_banned
-x 17
-y 16
-end
-arch cobblestones2
-x 17
-y 16
-end
-arch swall_2_1_2
-x 17
-y 16
-end
-arch magic_banned
-x 17
-y 17
-end
-arch cobblestones2
-x 17
 y 17
 end
 arch magic_banned
@@ -5975,6 +6587,34 @@ arch cobblestones2
 x 17
 y 20
 end
+arch magic_banned
+x 17
+y 21
+end
+arch cobblestones2
+x 17
+y 21
+end
+arch magic_banned
+x 17
+y 22
+end
+arch cobblestones2
+x 17
+y 22
+end
+arch swall_2_1_2
+x 17
+y 22
+end
+arch magic_banned
+x 17
+y 23
+end
+arch cobblestones2
+x 17
+y 23
+end
 arch dragon_exit
 name dragon express
 slaying /world/world_109_126
@@ -5984,34 +6624,6 @@ endmsg
 hp 16
 sp 20
 x 17
-y 20
-end
-arch magic_banned
-x 17
-y 21
-end
-arch cobblestones2
-x 17
-y 21
-end
-arch magic_banned
-x 17
-y 22
-end
-arch cobblestones2
-x 17
-y 22
-end
-arch swall_2_1_2
-x 17
-y 22
-end
-arch magic_banned
-x 17
-y 23
-end
-arch cobblestones2
-x 17
 y 23
 end
 arch magic_banned
@@ -6042,6 +6654,34 @@ arch cobblestones2
 x 17
 y 26
 end
+arch magic_banned
+x 17
+y 27
+end
+arch cobblestones2
+x 17
+y 27
+end
+arch magic_banned
+x 17
+y 28
+end
+arch cobblestones2
+x 17
+y 28
+end
+arch swall_2_1_2
+x 17
+y 28
+end
+arch magic_banned
+x 17
+y 29
+end
+arch cobblestones2
+x 17
+y 29
+end
 arch dragon_exit
 name dragon express
 slaying hangar
@@ -6051,55 +6691,59 @@ endmsg
 hp 34
 sp 8
 x 17
-y 26
+y 29
 end
 arch magic_banned
 x 17
-y 27
+y 30
 end
 arch cobblestones2
 x 17
-y 27
+y 30
 end
 arch magic_banned
 x 17
-y 28
+y 31
 end
 arch cobblestones2
 x 17
-y 28
+y 31
 end
 arch swall_2_1_2
 x 17
-y 28
-end
-arch magic_banned
-x 17
-y 29
-end
-arch cobblestones2
-x 17
-y 29
-end
-arch magic_banned
-x 17
-y 30
-end
-arch cobblestones2
-x 17
-y 30
-end
-arch magic_banned
-x 17
 y 31
 end
+arch magic_banned
+x 17
+y 32
+end
 arch cobblestones2
 x 17
-y 31
+y 32
+end
+arch magic_banned
+x 17
+y 33
+end
+arch cobblestones2
+x 17
+y 33
+end
+arch magic_banned
+x 17
+y 34
+end
+arch cobblestones2
+x 17
+y 34
 end
 arch awall_2_1_2
 x 17
-y 31
+y 34
+end
+arch blocked
+x 17
+y 35
 end
 arch magic_banned
 x 18
@@ -6118,7 +6762,7 @@ arch cobblestones2
 x 18
 y 1
 end
-arch awall_1_2
+arch awall_2_1_1
 x 18
 y 1
 end
@@ -6130,73 +6774,81 @@ arch cobblestones2
 x 18
 y 2
 end
-arch door_look_2
+arch awall_2_1_1
 x 18
 y 2
+end
+arch magic_banned
+x 18
+y 3
+end
+arch cobblestones2
+x 18
+y 3
+end
+arch awall_2_1_1
+x 18
+y 3
+end
+arch magic_banned
+x 18
+y 4
+end
+arch cobblestones2
+x 18
+y 4
+end
+arch awall_1_2
+x 18
+y 4
+end
+arch magic_banned
+x 18
+y 5
+end
+arch cobblestones2
+x 18
+y 5
+end
+arch door_look_2
+x 18
+y 5
 move_block 0
 end
 arch magic_banned
 x 18
-y 3
+y 6
 end
 arch cobblestones2
 x 18
-y 3
+y 6
 end
 arch awall_1_1
 x 18
-y 3
+y 6
 end
 arch magic_banned
 x 18
-y 4
+y 7
 end
 arch cobblestones2
 x 18
-y 4
+y 7
 end
 arch awall_2_1_1
 x 18
-y 4
+y 7
 end
 arch magic_banned
 x 18
-y 5
+y 8
 end
 arch cobblestones2
 x 18
-y 5
+y 8
 end
 arch awall_2_2_1
 x 18
-y 5
-end
-arch magic_banned
-x 18
-y 6
-end
-arch cobblestones2
-x 18
-y 6
-end
-arch magic_banned
-x 18
-y 7
-end
-arch cobblestones2
-x 18
-y 7
-end
-arch swall_2_1_2
-x 18
-y 7
-end
-arch magic_banned
-x 18
-y 8
-end
-arch cobblestones2
-x 18
 y 8
 end
 arch magic_banned
@@ -6227,6 +6879,34 @@ arch cobblestones2
 x 18
 y 11
 end
+arch magic_banned
+x 18
+y 12
+end
+arch cobblestones2
+x 18
+y 12
+end
+arch magic_banned
+x 18
+y 13
+end
+arch cobblestones2
+x 18
+y 13
+end
+arch swall_2_1_2
+x 18
+y 13
+end
+arch magic_banned
+x 18
+y 14
+end
+arch cobblestones2
+x 18
+y 14
+end
 arch sage
 name old traveler
 msg
@@ -6234,39 +6914,11 @@ msg
 I have travelled all around the world.
 endmsg
 x 18
-y 11
+y 14
 friendly 1
 end
 arch magic_banned
 x 18
-y 12
-end
-arch cobblestones2
-x 18
-y 12
-end
-arch magic_banned
-x 18
-y 13
-end
-arch cobblestones2
-x 18
-y 13
-end
-arch swall_2_1_2
-x 18
-y 13
-end
-arch magic_banned
-x 18
-y 14
-end
-arch cobblestones2
-x 18
-y 14
-end
-arch magic_banned
-x 18
 y 15
 end
 arch cobblestones2
@@ -6421,9 +7073,41 @@ arch cobblestones2
 x 18
 y 31
 end
+arch swall_2_1_2
+x 18
+y 31
+end
+arch magic_banned
+x 18
+y 32
+end
+arch cobblestones2
+x 18
+y 32
+end
+arch magic_banned
+x 18
+y 33
+end
+arch cobblestones2
+x 18
+y 33
+end
+arch magic_banned
+x 18
+y 34
+end
+arch cobblestones2
+x 18
+y 34
+end
 arch awall_2_1_2
 x 18
-y 31
+y 34
+end
+arch blocked
+x 18
+y 35
 end
 arch magic_banned
 x 19
@@ -6475,40 +7159,32 @@ arch cobblestones2
 x 19
 y 4
 end
+arch magic_banned
+x 19
+y 5
+end
+arch cobblestones2
+x 19
+y 5
+end
+arch magic_banned
+x 19
+y 6
+end
+arch cobblestones2
+x 19
+y 6
+end
+arch magic_banned
+x 19
+y 7
+end
+arch cobblestones2
+x 19
+y 7
+end
 arch chair_1.3
 x 19
-y 4
-end
-arch magic_banned
-x 19
-y 5
-end
-arch cobblestones2
-x 19
-y 5
-end
-arch awall_2_1_2
-x 19
-y 5
-end
-arch magic_banned
-x 19
-y 6
-end
-arch cobblestones2
-x 19
-y 6
-end
-arch magic_banned
-x 19
-y 7
-end
-arch cobblestones2
-x 19
-y 7
-end
-arch swall_2_1_2
-x 19
 y 7
 end
 arch magic_banned
@@ -6519,6 +7195,10 @@ arch cobblestones2
 x 19
 y 8
 end
+arch awall_2_1_2
+x 19
+y 8
+end
 arch magic_banned
 x 19
 y 9
@@ -6731,11 +7411,43 @@ arch cobblestones2
 x 19
 y 31
 end
-arch awall_2_1_2
+arch swall_2_1_2
 x 19
 y 31
 end
 arch magic_banned
+x 19
+y 32
+end
+arch cobblestones2
+x 19
+y 32
+end
+arch magic_banned
+x 19
+y 33
+end
+arch cobblestones2
+x 19
+y 33
+end
+arch magic_banned
+x 19
+y 34
+end
+arch cobblestones2
+x 19
+y 34
+end
+arch awall_2_1_2
+x 19
+y 34
+end
+arch blocked
+x 19
+y 35
+end
+arch magic_banned
 x 20
 end
 arch cobblestones2
@@ -6800,305 +7512,333 @@ arch cobblestones2
 x 20
 y 4
 end
+arch magic_banned
+x 20
+y 5
+end
+arch cobblestones2
+x 20
+y 5
+end
+arch magic_banned
+x 20
+y 6
+end
+arch cobblestones2
+x 20
+y 6
+end
+arch magic_banned
+x 20
+y 7
+end
+arch cobblestones2
+x 20
+y 7
+end
 arch table_2
 x 20
-y 4
+y 7
 end
 arch booze
 x 20
-y 4
+y 7
 end
 arch magic_banned
 x 20
-y 5
+y 8
 end
 arch cobblestones2
 x 20
-y 5
+y 8
 end
 arch awall_2_1_2
 x 20
-y 5
+y 8
 end
 arch magic_banned
 x 20
-y 6
+y 9
 end
 arch cobblestones2
 x 20
-y 6
+y 9
 end
 arch magic_banned
 x 20
-y 7
+y 10
 end
 arch cobblestones2
 x 20
-y 7
+y 10
 end
 arch swall_2_2_3
 x 20
-y 7
+y 10
 end
 arch magic_banned
 x 20
-y 8
+y 11
 end
 arch cobblestones2
 x 20
-y 8
+y 11
 end
 arch swall_1_2
 x 20
-y 8
+y 11
 end
 arch magic_banned
 x 20
-y 9
+y 12
 end
 arch cobblestones2
 x 20
-y 9
+y 12
 end
 arch grate_closed_2
 x 20
-y 9
+y 12
 connected 9
 end
 arch magic_banned
 x 20
-y 10
+y 13
 end
 arch cobblestones2
 x 20
-y 10
+y 13
 end
 arch swall_1_3
 x 20
-y 10
-end
-arch magic_banned
-x 20
-y 11
-end
-arch cobblestones2
-x 20
-y 11
-end
-arch magic_banned
-x 20
-y 12
-end
-arch cobblestones2
-x 20
-y 12
-end
-arch magic_banned
-x 20
 y 13
 end
+arch magic_banned
+x 20
+y 14
+end
 arch cobblestones2
 x 20
-y 13
+y 14
+end
+arch magic_banned
+x 20
+y 15
+end
+arch cobblestones2
+x 20
+y 15
+end
+arch magic_banned
+x 20
+y 16
+end
+arch cobblestones2
+x 20
+y 16
 end
 arch swall_2_2_3
 x 20
-y 13
+y 16
 end
 arch magic_banned
 x 20
-y 14
+y 17
 end
 arch cobblestones2
 x 20
-y 14
+y 17
 end
 arch swall_1_2
 x 20
-y 14
+y 17
 end
 arch magic_banned
 x 20
-y 15
+y 18
 end
 arch cobblestones2
 x 20
-y 15
+y 18
 end
 arch grate_closed_2
 x 20
-y 15
+y 18
 connected 11
 end
 arch magic_banned
 x 20
-y 16
+y 19
 end
 arch cobblestones2
 x 20
-y 16
+y 19
 end
 arch swall_1_3
 x 20
-y 16
-end
-arch magic_banned
-x 20
-y 17
-end
-arch cobblestones2
-x 20
-y 17
-end
-arch magic_banned
-x 20
-y 18
-end
-arch cobblestones2
-x 20
-y 18
-end
-arch magic_banned
-x 20
 y 19
 end
+arch magic_banned
+x 20
+y 20
+end
 arch cobblestones2
 x 20
-y 19
+y 20
+end
+arch magic_banned
+x 20
+y 21
+end
+arch cobblestones2
+x 20
+y 21
+end
+arch magic_banned
+x 20
+y 22
+end
+arch cobblestones2
+x 20
+y 22
 end
 arch swall_2_2_3
 x 20
-y 19
+y 22
 end
 arch magic_banned
 x 20
-y 20
+y 23
 end
 arch cobblestones2
 x 20
-y 20
+y 23
 end
 arch swall_1_2
 x 20
-y 20
+y 23
 end
 arch magic_banned
 x 20
-y 21
+y 24
 end
 arch cobblestones2
 x 20
-y 21
+y 24
 end
 arch grate_closed_2
 x 20
-y 21
+y 24
 connected 13
 end
 arch magic_banned
 x 20
-y 22
+y 25
 end
 arch cobblestones2
 x 20
-y 22
+y 25
 end
 arch swall_1_3
 x 20
-y 22
-end
-arch magic_banned
-x 20
-y 23
-end
-arch cobblestones2
-x 20
-y 23
-end
-arch magic_banned
-x 20
-y 24
-end
-arch cobblestones2
-x 20
-y 24
-end
-arch magic_banned
-x 20
 y 25
 end
+arch magic_banned
+x 20
+y 26
+end
 arch cobblestones2
 x 20
-y 25
+y 26
+end
+arch magic_banned
+x 20
+y 27
+end
+arch cobblestones2
+x 20
+y 27
+end
+arch magic_banned
+x 20
+y 28
+end
+arch cobblestones2
+x 20
+y 28
 end
 arch swall_2_2_3
 x 20
-y 25
+y 28
 end
 arch magic_banned
 x 20
-y 26
+y 29
 end
 arch cobblestones2
 x 20
-y 26
+y 29
 end
 arch swall_1_2
 x 20
-y 26
+y 29
 end
 arch magic_banned
 x 20
-y 27
+y 30
 end
 arch cobblestones2
 x 20
-y 27
+y 30
 end
 arch grate_closed_2
 x 20
-y 27
+y 30
 connected 15
 end
 arch magic_banned
 x 20
-y 28
+y 31
 end
 arch cobblestones2
 x 20
-y 28
+y 31
 end
 arch swall_1_3
 x 20
-y 28
-end
-arch magic_banned
-x 20
-y 29
-end
-arch cobblestones2
-x 20
-y 29
-end
-arch magic_banned
-x 20
-y 30
-end
-arch cobblestones2
-x 20
-y 30
-end
-arch magic_banned
-x 20
 y 31
 end
+arch magic_banned
+x 20
+y 32
+end
 arch cobblestones2
 x 20
-y 31
+y 32
+end
+arch magic_banned
+x 20
+y 33
+end
+arch cobblestones2
+x 20
+y 33
+end
+arch magic_banned
+x 20
+y 34
+end
+arch cobblestones2
+x 20
+y 34
 end
 arch awall_2_1_2
 x 20
-y 31
+y 34
+end
+arch blocked
+x 20
+y 35
 end
 arch magic_banned
 x 21
@@ -7129,7 +7869,7 @@ arch cobblestones2
 x 21
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 21
 y 2
 end
@@ -7141,6 +7881,10 @@ arch cobblestones2
 x 21
 y 3
 end
+arch awall_1_2
+x 21
+y 3
+end
 arch magic_banned
 x 21
 y 4
@@ -7149,87 +7893,87 @@ arch cobblestones2
 x 21
 y 4
 end
+arch magic_banned
+x 21
+y 5
+end
+arch cobblestones2
+x 21
+y 5
+end
+arch magic_banned
+x 21
+y 6
+end
+arch cobblestones2
+x 21
+y 6
+end
+arch magic_banned
+x 21
+y 7
+end
+arch cobblestones2
+x 21
+y 7
+end
 arch chair_1.3
 x 21
-y 4
+y 7
 end
 arch magic_banned
 x 21
-y 5
+y 8
 end
 arch cobblestones2
 x 21
-y 5
+y 8
 end
 arch awall_2_1_2
 x 21
-y 5
-end
-arch magic_banned
-x 21
-y 6
-end
-arch cobblestones2
-x 21
-y 6
-end
-arch magic_banned
-x 21
-y 7
-end
-arch cobblestones2
-x 21
-y 7
-end
-arch magic_banned
-x 21
 y 8
 end
+arch magic_banned
+x 21
+y 9
+end
 arch cobblestones2
 x 21
-y 8
+y 9
+end
+arch magic_banned
+x 21
+y 10
+end
+arch cobblestones2
+x 21
+y 10
+end
+arch magic_banned
+x 21
+y 11
+end
+arch cobblestones2
+x 21
+y 11
 end
 arch altar_trigger
 name To Lone Town
 slaying Ticket To Lone Town
 food 1
 x 21
-y 8
+y 11
 connected 9
 end
 arch magic_banned
 x 21
-y 9
+y 12
 end
 arch magic_mouth
 msg
 Lone Town
 endmsg
 x 21
-y 9
-end
-arch cobblestones2
-x 21
-y 9
-end
-arch magic_banned
-x 21
-y 10
-end
-arch cobblestones2
-x 21
-y 10
-end
-arch magic_banned
-x 21
-y 11
-end
-arch cobblestones2
-x 21
-y 11
-end
-arch magic_banned
-x 21
 y 12
 end
 arch cobblestones2
@@ -7252,47 +7996,47 @@ arch cobblestones2
 x 21
 y 14
 end
+arch magic_banned
+x 21
+y 15
+end
+arch cobblestones2
+x 21
+y 15
+end
+arch magic_banned
+x 21
+y 16
+end
+arch cobblestones2
+x 21
+y 16
+end
+arch magic_banned
+x 21
+y 17
+end
+arch cobblestones2
+x 21
+y 17
+end
 arch altar_trigger
 name To Scorn
 slaying Ticket To Scorn
 food 1
 x 21
-y 14
+y 17
 connected 11
 end
 arch magic_banned
 x 21
-y 15
+y 18
 end
 arch magic_mouth
 msg
 Scorn
 endmsg
 x 21
-y 15
-end
-arch cobblestones2
-x 21
-y 15
-end
-arch magic_banned
-x 21
-y 16
-end
-arch cobblestones2
-x 21
-y 16
-end
-arch magic_banned
-x 21
-y 17
-end
-arch cobblestones2
-x 21
-y 17
-end
-arch magic_banned
-x 21
 y 18
 end
 arch cobblestones2
@@ -7315,47 +8059,47 @@ arch cobblestones2
 x 21
 y 20
 end
+arch magic_banned
+x 21
+y 21
+end
+arch cobblestones2
+x 21
+y 21
+end
+arch magic_banned
+x 21
+y 22
+end
+arch cobblestones2
+x 21
+y 22
+end
+arch magic_banned
+x 21
+y 23
+end
+arch cobblestones2
+x 21
+y 23
+end
 arch altar_trigger
 name To Lake Country
 slaying Ticket To Lake Country
 food 1
 x 21
-y 20
+y 23
 connected 13
 end
 arch magic_banned
 x 21
-y 21
+y 24
 end
 arch magic_mouth
 msg
 Lake Country
 endmsg
 x 21
-y 21
-end
-arch cobblestones2
-x 21
-y 21
-end
-arch magic_banned
-x 21
-y 22
-end
-arch cobblestones2
-x 21
-y 22
-end
-arch magic_banned
-x 21
-y 23
-end
-arch cobblestones2
-x 21
-y 23
-end
-arch magic_banned
-x 21
 y 24
 end
 arch cobblestones2
@@ -7378,47 +8122,47 @@ arch cobblestones2
 x 21
 y 26
 end
+arch magic_banned
+x 21
+y 27
+end
+arch cobblestones2
+x 21
+y 27
+end
+arch magic_banned
+x 21
+y 28
+end
+arch cobblestones2
+x 21
+y 28
+end
+arch magic_banned
+x 21
+y 29
+end
+arch cobblestones2
+x 21
+y 29
+end
 arch altar_trigger
 name Random
 slaying Random Ticket
 food 1
 x 21
-y 26
+y 29
 connected 15
 end
 arch magic_banned
 x 21
-y 27
+y 30
 end
 arch magic_mouth
 msg
 Random place
 endmsg
 x 21
-y 27
-end
-arch cobblestones2
-x 21
-y 27
-end
-arch magic_banned
-x 21
-y 28
-end
-arch cobblestones2
-x 21
-y 28
-end
-arch magic_banned
-x 21
-y 29
-end
-arch cobblestones2
-x 21
-y 29
-end
-arch magic_banned
-x 21
 y 30
 end
 arch cobblestones2
@@ -7433,9 +8177,37 @@ arch cobblestones2
 x 21
 y 31
 end
+arch magic_banned
+x 21
+y 32
+end
+arch cobblestones2
+x 21
+y 32
+end
+arch magic_banned
+x 21
+y 33
+end
+arch cobblestones2
+x 21
+y 33
+end
+arch magic_banned
+x 21
+y 34
+end
+arch cobblestones2
+x 21
+y 34
+end
 arch awall_2_1_2
 x 21
-y 31
+y 34
+end
+arch blocked
+x 21
+y 35
 end
 arch magic_banned
 x 22
@@ -7502,40 +8274,36 @@ arch cobblestones2
 x 22
 y 4
 end
+arch magic_banned
+x 22
+y 5
+end
+arch cobblestones2
+x 22
+y 5
+end
+arch magic_banned
+x 22
+y 6
+end
+arch cobblestones2
+x 22
+y 6
+end
+arch magic_banned
+x 22
+y 7
+end
+arch cobblestones2
+x 22
+y 7
+end
 arch table_2
 x 22
-y 4
+y 7
 end
 arch random_food
 x 22
-y 4
-end
-arch magic_banned
-x 22
-y 5
-end
-arch cobblestones2
-x 22
-y 5
-end
-arch awall_2_1_2
-x 22
-y 5
-end
-arch magic_banned
-x 22
-y 6
-end
-arch cobblestones2
-x 22
-y 6
-end
-arch magic_banned
-x 22
-y 7
-end
-arch cobblestones2
-x 22
 y 7
 end
 arch magic_banned
@@ -7546,6 +8314,10 @@ arch cobblestones2
 x 22
 y 8
 end
+arch awall_2_1_2
+x 22
+y 8
+end
 arch magic_banned
 x 22
 y 9
@@ -7730,9 +8502,37 @@ arch cobblestones2
 x 22
 y 31
 end
+arch magic_banned
+x 22
+y 32
+end
+arch cobblestones2
+x 22
+y 32
+end
+arch magic_banned
+x 22
+y 33
+end
+arch cobblestones2
+x 22
+y 33
+end
+arch magic_banned
+x 22
+y 34
+end
+arch cobblestones2
+x 22
+y 34
+end
 arch awall_2_1_2
 x 22
-y 31
+y 34
+end
+arch blocked
+x 22
+y 35
 end
 arch magic_banned
 x 23
@@ -7763,7 +8563,7 @@ arch cobblestones2
 x 23
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 23
 y 2
 end
@@ -7775,6 +8575,10 @@ arch cobblestones2
 x 23
 y 3
 end
+arch awall_1_2
+x 23
+y 3
+end
 arch magic_banned
 x 23
 y 4
@@ -7783,44 +8587,44 @@ arch cobblestones2
 x 23
 y 4
 end
+arch magic_banned
+x 23
+y 5
+end
+arch cobblestones2
+x 23
+y 5
+end
+arch magic_banned
+x 23
+y 6
+end
+arch cobblestones2
+x 23
+y 6
+end
+arch magic_banned
+x 23
+y 7
+end
+arch cobblestones2
+x 23
+y 7
+end
 arch chair_1.3
 x 23
-y 4
+y 7
 end
 arch magic_banned
 x 23
-y 5
+y 8
 end
 arch cobblestones2
 x 23
-y 5
+y 8
 end
 arch awall_2_1_2
 x 23
-y 5
-end
-arch magic_banned
-x 23
-y 6
-end
-arch cobblestones2
-x 23
-y 6
-end
-arch magic_banned
-x 23
-y 7
-end
-arch cobblestones2
-x 23
-y 7
-end
-arch magic_banned
-x 23
-y 8
-end
-arch cobblestones2
-x 23
 y 8
 end
 arch magic_banned
@@ -7951,6 +8755,30 @@ arch cobblestones2
 x 23
 y 24
 end
+arch magic_banned
+x 23
+y 25
+end
+arch cobblestones2
+x 23
+y 25
+end
+arch magic_banned
+x 23
+y 26
+end
+arch cobblestones2
+x 23
+y 26
+end
+arch magic_banned
+x 23
+y 27
+end
+arch cobblestones2
+x 23
+y 27
+end
 arch dog
 msg
 @match good
@@ -7961,35 +8789,11 @@ Snarl...
 Grrr...
 endmsg
 x 23
-y 24
+y 27
 unaggressive 1
 end
 arch magic_banned
 x 23
-y 25
-end
-arch cobblestones2
-x 23
-y 25
-end
-arch magic_banned
-x 23
-y 26
-end
-arch cobblestones2
-x 23
-y 26
-end
-arch magic_banned
-x 23
-y 27
-end
-arch cobblestones2
-x 23
-y 27
-end
-arch magic_banned
-x 23
 y 28
 end
 arch cobblestones2
@@ -8020,9 +8824,37 @@ arch cobblestones2
 x 23
 y 31
 end
+arch magic_banned
+x 23
+y 32
+end
+arch cobblestones2
+x 23
+y 32
+end
+arch magic_banned
+x 23
+y 33
+end
+arch cobblestones2
+x 23
+y 33
+end
+arch magic_banned
+x 23
+y 34
+end
+arch cobblestones2
+x 23
+y 34
+end
 arch awall_2_1_2
 x 23
-y 31
+y 34
+end
+arch blocked
+x 23
+y 35
 end
 arch magic_banned
 x 24
@@ -8089,91 +8921,91 @@ arch cobblestones2
 x 24
 y 4
 end
+arch magic_banned
+x 24
+y 5
+end
+arch cobblestones2
+x 24
+y 5
+end
+arch magic_banned
+x 24
+y 6
+end
+arch cobblestones2
+x 24
+y 6
+end
+arch magic_banned
+x 24
+y 7
+end
+arch cobblestones2
+x 24
+y 7
+end
 arch table_2
 x 24
-y 4
+y 7
 end
 arch random_food
 x 24
-y 4
+y 7
 end
 arch magic_banned
 x 24
-y 5
+y 8
 end
 arch cobblestones2
 x 24
-y 5
+y 8
 end
 arch awall_2_1_2
 x 24
-y 5
-end
-arch magic_banned
-x 24
-y 6
-end
-arch cobblestones2
-x 24
-y 6
-end
-arch magic_banned
-x 24
-y 7
-end
-arch cobblestones2
-x 24
-y 7
-end
-arch magic_banned
-x 24
 y 8
 end
+arch magic_banned
+x 24
+y 9
+end
 arch cobblestones2
 x 24
-y 8
+y 9
+end
+arch magic_banned
+x 24
+y 10
+end
+arch cobblestones2
+x 24
+y 10
+end
+arch magic_banned
+x 24
+y 11
+end
+arch cobblestones2
+x 24
+y 11
 end
 arch altar_trigger
 name To Santo Dominion
 slaying Ticket To Santo Dominion
 food 1
 x 24
-y 8
+y 11
 connected 10
 end
 arch magic_banned
 x 24
-y 9
+y 12
 end
 arch magic_mouth
 msg
 Santo Dominion
 endmsg
 x 24
-y 9
-end
-arch cobblestones2
-x 24
-y 9
-end
-arch magic_banned
-x 24
-y 10
-end
-arch cobblestones2
-x 24
-y 10
-end
-arch magic_banned
-x 24
-y 11
-end
-arch cobblestones2
-x 24
-y 11
-end
-arch magic_banned
-x 24
 y 12
 end
 arch cobblestones2
@@ -8196,47 +9028,47 @@ arch cobblestones2
 x 24
 y 14
 end
+arch magic_banned
+x 24
+y 15
+end
+arch cobblestones2
+x 24
+y 15
+end
+arch magic_banned
+x 24
+y 16
+end
+arch cobblestones2
+x 24
+y 16
+end
+arch magic_banned
+x 24
+y 17
+end
+arch cobblestones2
+x 24
+y 17
+end
 arch altar_trigger
 name Random
 slaying Random Ticket
 food 1
 x 24
-y 14
+y 17
 connected 12
 end
 arch magic_banned
 x 24
-y 15
+y 18
 end
 arch magic_mouth
 msg
 Random place
 endmsg
 x 24
-y 15
-end
-arch cobblestones2
-x 24
-y 15
-end
-arch magic_banned
-x 24
-y 16
-end
-arch cobblestones2
-x 24
-y 16
-end
-arch magic_banned
-x 24
-y 17
-end
-arch cobblestones2
-x 24
-y 17
-end
-arch magic_banned
-x 24
 y 18
 end
 arch cobblestones2
@@ -8259,47 +9091,47 @@ arch cobblestones2
 x 24
 y 20
 end
+arch magic_banned
+x 24
+y 21
+end
+arch cobblestones2
+x 24
+y 21
+end
+arch magic_banned
+x 24
+y 22
+end
+arch cobblestones2
+x 24
+y 22
+end
+arch magic_banned
+x 24
+y 23
+end
+arch cobblestones2
+x 24
+y 23
+end
 arch altar_trigger
 name To Nurnberg
 slaying Ticket To Nurnberg
 food 1
 x 24
-y 20
+y 23
 connected 14
 end
 arch magic_banned
 x 24
-y 21
+y 24
 end
 arch cobblestones2
 msg
 Nurnberg
 endmsg
 x 24
-y 21
-end
-arch magic_banned
-x 24
-y 22
-end
-arch cobblestones2
-x 24
-y 22
-end
-arch magic_banned
-x 24
-y 23
-end
-arch cobblestones2
-x 24
-y 23
-end
-arch magic_banned
-x 24
-y 24
-end
-arch cobblestones2
-x 24
 y 24
 end
 arch magic_banned
@@ -8318,54 +9150,54 @@ arch cobblestones2
 x 24
 y 26
 end
+arch magic_banned
+x 24
+y 27
+end
+arch cobblestones2
+x 24
+y 27
+end
+arch magic_banned
+x 24
+y 28
+end
+arch cobblestones2
+x 24
+y 28
+end
+arch magic_banned
+x 24
+y 29
+end
+arch cobblestones2
+x 24
+y 29
+end
 arch altar_trigger
 name Random
 slaying Random Ticket
 food 1
 x 24
-y 26
+y 29
 connected 16
 end
 arch magic_banned
 x 24
-y 27
+y 30
 end
 arch magic_mouth
 msg
 Random Place
 endmsg
 x 24
-y 27
+y 30
 end
 arch cobblestones2
 msg
 Random Place
 endmsg
 x 24
-y 27
-end
-arch magic_banned
-x 24
-y 28
-end
-arch cobblestones2
-x 24
-y 28
-end
-arch magic_banned
-x 24
-y 29
-end
-arch cobblestones2
-x 24
-y 29
-end
-arch magic_banned
-x 24
-y 30
-end
-arch cobblestones2
-x 24
 y 30
 end
 arch magic_banned
@@ -8376,9 +9208,37 @@ arch cobblestones2
 x 24
 y 31
 end
+arch magic_banned
+x 24
+y 32
+end
+arch cobblestones2
+x 24
+y 32
+end
+arch magic_banned
+x 24
+y 33
+end
+arch cobblestones2
+x 24
+y 33
+end
+arch magic_banned
+x 24
+y 34
+end
+arch cobblestones2
+x 24
+y 34
+end
 arch awall_2_1_2
 x 24
-y 31
+y 34
+end
+arch blocked
+x 24
+y 35
 end
 arch magic_banned
 x 25
@@ -8409,7 +9269,7 @@ arch cobblestones2
 x 25
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 25
 y 2
 end
@@ -8421,6 +9281,10 @@ arch cobblestones2
 x 25
 y 3
 end
+arch awall_1_2
+x 25
+y 3
+end
 arch magic_banned
 x 25
 y 4
@@ -8429,301 +9293,329 @@ arch cobblestones2
 x 25
 y 4
 end
+arch magic_banned
+x 25
+y 5
+end
+arch cobblestones2
+x 25
+y 5
+end
+arch magic_banned
+x 25
+y 6
+end
+arch cobblestones2
+x 25
+y 6
+end
+arch magic_banned
+x 25
+y 7
+end
+arch cobblestones2
+x 25
+y 7
+end
 arch chair_1.3
 x 25
-y 4
+y 7
 end
 arch magic_banned
 x 25
-y 5
+y 8
 end
 arch cobblestones2
 x 25
-y 5
+y 8
 end
 arch awall_2_1_2
 x 25
-y 5
+y 8
 end
 arch magic_banned
 x 25
-y 6
+y 9
 end
 arch cobblestones2
 x 25
-y 6
+y 9
 end
 arch magic_banned
 x 25
-y 7
+y 10
 end
 arch cobblestones2
 x 25
-y 7
+y 10
 end
 arch swall_2_2_2
 x 25
-y 7
+y 10
 end
 arch magic_banned
 x 25
-y 8
+y 11
 end
 arch cobblestones2
 x 25
-y 8
+y 11
 end
 arch swall_1_2
 x 25
-y 8
+y 11
 end
 arch magic_banned
 x 25
-y 9
+y 12
 end
 arch cobblestones2
 x 25
-y 9
+y 12
 end
 arch grate_closed_2
 x 25
-y 9
+y 12
 connected 10
 end
 arch magic_banned
 x 25
-y 10
+y 13
 end
 arch cobblestones2
 x 25
-y 10
+y 13
 end
 arch swall_1_4
 x 25
-y 10
-end
-arch magic_banned
-x 25
-y 11
-end
-arch cobblestones2
-x 25
-y 11
-end
-arch magic_banned
-x 25
-y 12
-end
-arch cobblestones2
-x 25
-y 12
-end
-arch magic_banned
-x 25
 y 13
 end
+arch magic_banned
+x 25
+y 14
+end
 arch cobblestones2
 x 25
-y 13
+y 14
+end
+arch magic_banned
+x 25
+y 15
+end
+arch cobblestones2
+x 25
+y 15
+end
+arch magic_banned
+x 25
+y 16
+end
+arch cobblestones2
+x 25
+y 16
 end
 arch swall_2_2_2
 x 25
-y 13
+y 16
 end
 arch magic_banned
 x 25
-y 14
+y 17
 end
 arch cobblestones2
 x 25
-y 14
+y 17
 end
 arch swall_1_2
 x 25
-y 14
+y 17
 end
 arch magic_banned
 x 25
-y 15
+y 18
 end
 arch cobblestones2
 x 25
-y 15
+y 18
 end
 arch grate_closed_2
 x 25
-y 15
+y 18
 connected 12
 end
 arch magic_banned
 x 25
-y 16
+y 19
 end
 arch cobblestones2
 x 25
-y 16
+y 19
 end
 arch swall_1_4
 x 25
-y 16
-end
-arch magic_banned
-x 25
-y 17
-end
-arch cobblestones2
-x 25
-y 17
-end
-arch magic_banned
-x 25
-y 18
-end
-arch cobblestones2
-x 25
-y 18
-end
-arch magic_banned
-x 25
 y 19
 end
+arch magic_banned
+x 25
+y 20
+end
 arch cobblestones2
 x 25
-y 19
+y 20
+end
+arch magic_banned
+x 25
+y 21
+end
+arch cobblestones2
+x 25
+y 21
+end
+arch magic_banned
+x 25
+y 22
+end
+arch cobblestones2
+x 25
+y 22
 end
 arch swall_2_2_2
 x 25
-y 19
+y 22
 end
 arch magic_banned
 x 25
-y 20
+y 23
 end
 arch cobblestones2
 x 25
-y 20
+y 23
 end
 arch swall_1_2
 x 25
-y 20
+y 23
 end
 arch magic_banned
 x 25
-y 21
+y 24
 end
 arch cobblestones2
 x 25
-y 21
+y 24
 end
 arch grate_closed_2
 x 25
-y 21
+y 24
 connected 14
 end
 arch magic_banned
 x 25
-y 22
+y 25
 end
 arch cobblestones2
 x 25
-y 22
+y 25
 end
 arch swall_1_4
 x 25
-y 22
-end
-arch magic_banned
-x 25
-y 23
-end
-arch cobblestones2
-x 25
-y 23
-end
-arch magic_banned
-x 25
-y 24
-end
-arch cobblestones2
-x 25
-y 24
-end
-arch magic_banned
-x 25
 y 25
 end
+arch magic_banned
+x 25
+y 26
+end
 arch cobblestones2
 x 25
-y 25
+y 26
+end
+arch magic_banned
+x 25
+y 27
+end
+arch cobblestones2
+x 25
+y 27
+end
+arch magic_banned
+x 25
+y 28
+end
+arch cobblestones2
+x 25
+y 28
 end
 arch swall_2_2_2
 x 25
-y 25
+y 28
 end
 arch magic_banned
 x 25
-y 26
+y 29
 end
 arch cobblestones2
 x 25
-y 26
+y 29
 end
 arch swall_1_2
 x 25
-y 26
+y 29
 end
 arch magic_banned
 x 25
-y 27
+y 30
 end
 arch cobblestones2
 x 25
-y 27
+y 30
 end
 arch grate_closed_2
 x 25
-y 27
+y 30
 connected 16
 end
 arch magic_banned
 x 25
-y 28
+y 31
 end
 arch cobblestones2
 x 25
-y 28
+y 31
 end
 arch swall_1_4
 x 25
-y 28
-end
-arch magic_banned
-x 25
-y 29
-end
-arch cobblestones2
-x 25
-y 29
-end
-arch magic_banned
-x 25
-y 30
-end
-arch cobblestones2
-x 25
-y 30
-end
-arch magic_banned
-x 25
 y 31
 end
+arch magic_banned
+x 25
+y 32
+end
 arch cobblestones2
 x 25
-y 31
+y 32
+end
+arch magic_banned
+x 25
+y 33
+end
+arch cobblestones2
+x 25
+y 33
+end
+arch magic_banned
+x 25
+y 34
+end
+arch cobblestones2
+x 25
+y 34
 end
 arch awall_2_1_2
 x 25
-y 31
+y 34
+end
+arch blocked
+x 25
+y 35
 end
 arch magic_banned
 x 26
@@ -8790,53 +9682,77 @@ arch cobblestones2
 x 26
 y 4
 end
+arch magic_banned
+x 26
+y 5
+end
+arch cobblestones2
+x 26
+y 5
+end
+arch magic_banned
+x 26
+y 6
+end
+arch cobblestones2
+x 26
+y 6
+end
+arch magic_banned
+x 26
+y 7
+end
+arch cobblestones2
+x 26
+y 7
+end
 arch table_2
 x 26
-y 4
+y 7
 end
 arch random_food
 x 26
-y 4
+y 7
 end
 arch magic_banned
 x 26
-y 5
+y 8
 end
 arch cobblestones2
 x 26
-y 5
+y 8
 end
 arch awall_2_1_2
 x 26
-y 5
+y 8
 end
 arch magic_banned
 x 26
-y 6
+y 9
 end
 arch cobblestones2
 x 26
-y 6
+y 9
 end
 arch magic_banned
 x 26
-y 7
+y 10
 end
 arch cobblestones2
 x 26
-y 7
+y 10
 end
 arch swall_2_1_2
 x 26
-y 7
+y 10
 end
 arch magic_banned
 x 26
-y 8
+y 11
 end
 arch cobblestones2
 x 26
-y 8
+y 11
 end
 arch dragon_exit
 name dragon express
@@ -8847,34 +9763,6 @@ endmsg
 hp 17
 sp 12
 x 26
-y 8
-end
-arch magic_banned
-x 26
-y 9
-end
-arch cobblestones2
-x 26
-y 9
-end
-arch magic_banned
-x 26
-y 10
-end
-arch cobblestones2
-x 26
-y 10
-end
-arch swall_2_1_2
-x 26
-y 10
-end
-arch magic_banned
-x 26
-y 11
-end
-arch cobblestones2
-x 26
 y 11
 end
 arch magic_banned
@@ -8905,6 +9793,34 @@ arch cobblestones2
 x 26
 y 14
 end
+arch magic_banned
+x 26
+y 15
+end
+arch cobblestones2
+x 26
+y 15
+end
+arch magic_banned
+x 26
+y 16
+end
+arch cobblestones2
+x 26
+y 16
+end
+arch swall_2_1_2
+x 26
+y 16
+end
+arch magic_banned
+x 26
+y 17
+end
+arch cobblestones2
+x 26
+y 17
+end
 arch dragon_exit
 name dragon express
 slaying hangar
@@ -8914,34 +9830,6 @@ endmsg
 hp 34
 sp 8
 x 26
-y 14
-end
-arch magic_banned
-x 26
-y 15
-end
-arch cobblestones2
-x 26
-y 15
-end
-arch magic_banned
-x 26
-y 16
-end
-arch cobblestones2
-x 26
-y 16
-end
-arch swall_2_1_2
-x 26
-y 16
-end
-arch magic_banned
-x 26
-y 17
-end
-arch cobblestones2
-x 26
 y 17
 end
 arch magic_banned
@@ -8972,6 +9860,34 @@ arch cobblestones2
 x 26
 y 20
 end
+arch magic_banned
+x 26
+y 21
+end
+arch cobblestones2
+x 26
+y 21
+end
+arch magic_banned
+x 26
+y 22
+end
+arch cobblestones2
+x 26
+y 22
+end
+arch swall_2_1_2
+x 26
+y 22
+end
+arch magic_banned
+x 26
+y 23
+end
+arch cobblestones2
+x 26
+y 23
+end
 arch dragon_exit
 name dragon express
 slaying /pup_land/nurnberg/city
@@ -8981,34 +9897,6 @@ endmsg
 hp 25
 sp 15
 x 26
-y 20
-end
-arch magic_banned
-x 26
-y 21
-end
-arch cobblestones2
-x 26
-y 21
-end
-arch magic_banned
-x 26
-y 22
-end
-arch cobblestones2
-x 26
-y 22
-end
-arch swall_2_1_2
-x 26
-y 22
-end
-arch magic_banned
-x 26
-y 23
-end
-arch cobblestones2
-x 26
 y 23
 end
 arch magic_banned
@@ -9039,6 +9927,34 @@ arch cobblestones2
 x 26
 y 26
 end
+arch magic_banned
+x 26
+y 27
+end
+arch cobblestones2
+x 26
+y 27
+end
+arch magic_banned
+x 26
+y 28
+end
+arch cobblestones2
+x 26
+y 28
+end
+arch swall_2_1_2
+x 26
+y 28
+end
+arch magic_banned
+x 26
+y 29
+end
+arch cobblestones2
+x 26
+y 29
+end
 arch dragon_exit
 name dragon express
 slaying hangar
@@ -9048,55 +9964,59 @@ endmsg
 hp 34
 sp 8
 x 26
-y 26
+y 29
 end
 arch magic_banned
 x 26
-y 27
+y 30
 end
 arch cobblestones2
 x 26
-y 27
+y 30
 end
 arch magic_banned
 x 26
-y 28
+y 31
 end
 arch cobblestones2
 x 26
-y 28
+y 31
 end
 arch swall_2_1_2
 x 26
-y 28
-end
-arch magic_banned
-x 26
-y 29
-end
-arch cobblestones2
-x 26
-y 29
-end
-arch magic_banned
-x 26
-y 30
-end
-arch cobblestones2
-x 26
-y 30
-end
-arch magic_banned
-x 26
 y 31
 end
+arch magic_banned
+x 26
+y 32
+end
 arch cobblestones2
 x 26
-y 31
+y 32
+end
+arch magic_banned
+x 26
+y 33
+end
+arch cobblestones2
+x 26
+y 33
+end
+arch magic_banned
+x 26
+y 34
+end
+arch cobblestones2
+x 26
+y 34
 end
 arch awall_2_1_2
 x 26
-y 31
+y 34
+end
+arch blocked
+x 26
+y 35
 end
 arch magic_banned
 x 27
@@ -9127,7 +10047,7 @@ arch cobblestones2
 x 27
 y 2
 end
-arch awall_1_2
+arch awall_2_1_1
 x 27
 y 2
 end
@@ -9139,6 +10059,10 @@ arch cobblestones2
 x 27
 y 3
 end
+arch awall_1_2
+x 27
+y 3
+end
 arch magic_banned
 x 27
 y 4
@@ -9147,40 +10071,32 @@ arch cobblestones2
 x 27
 y 4
 end
+arch magic_banned
+x 27
+y 5
+end
+arch cobblestones2
+x 27
+y 5
+end
+arch magic_banned
+x 27
+y 6
+end
+arch cobblestones2
+x 27
+y 6
+end
+arch magic_banned
+x 27
+y 7
+end
+arch cobblestones2
+x 27
+y 7
+end
 arch chair_1.3
 x 27
-y 4
-end
-arch magic_banned
-x 27
-y 5
-end
-arch cobblestones2
-x 27
-y 5
-end
-arch awall_2_1_2
-x 27
-y 5
-end
-arch magic_banned
-x 27
-y 6
-end
-arch cobblestones2
-x 27
-y 6
-end
-arch magic_banned
-x 27
-y 7
-end
-arch cobblestones2
-x 27
-y 7
-end
-arch swall_2_1_2
-x 27
 y 7
 end
 arch magic_banned
@@ -9191,6 +10107,10 @@ arch cobblestones2
 x 27
 y 8
 end
+arch awall_2_1_2
+x 27
+y 8
+end
 arch magic_banned
 x 27
 y 9
@@ -9403,11 +10323,43 @@ arch cobblestones2
 x 27
 y 31
 end
-arch awall_2_1_2
+arch swall_2_1_2
 x 27
 y 31
 end
 arch magic_banned
+x 27
+y 32
+end
+arch cobblestones2
+x 27
+y 32
+end
+arch magic_banned
+x 27
+y 33
+end
+arch cobblestones2
+x 27
+y 33
+end
+arch magic_banned
+x 27
+y 34
+end
+arch cobblestones2
+x 27
+y 34
+end
+arch awall_2_1_2
+x 27
+y 34
+end
+arch blocked
+x 27
+y 35
+end
+arch magic_banned
 x 28
 end
 arch cobblestones2
@@ -9472,44 +10424,36 @@ arch cobblestones2
 x 28
 y 4
 end
+arch magic_banned
+x 28
+y 5
+end
+arch cobblestones2
+x 28
+y 5
+end
+arch magic_banned
+x 28
+y 6
+end
+arch cobblestones2
+x 28
+y 6
+end
+arch magic_banned
+x 28
+y 7
+end
+arch cobblestones2
+x 28
+y 7
+end
 arch table_2
 x 28
-y 4
+y 7
 end
 arch random_food
 x 28
-y 4
-end
-arch magic_banned
-x 28
-y 5
-end
-arch cobblestones2
-x 28
-y 5
-end
-arch awall_2_1_2
-x 28
-y 5
-end
-arch magic_banned
-x 28
-y 6
-end
-arch cobblestones2
-x 28
-y 6
-end
-arch magic_banned
-x 28
-y 7
-end
-arch cobblestones2
-x 28
-y 7
-end
-arch swall_2_1_2
-x 28
 y 7
 end
 arch magic_banned
@@ -9520,6 +10464,10 @@ arch cobblestones2
 x 28
 y 8
 end
+arch awall_2_1_2
+x 28
+y 8
+end
 arch magic_banned
 x 28
 y 9
@@ -9732,11 +10680,43 @@ arch cobblestones2
 x 28
 y 31
 end
-arch awall_2_1_2
+arch swall_2_1_2
 x 28
 y 31
 end
 arch magic_banned
+x 28
+y 32
+end
+arch cobblestones2
+x 28
+y 32
+end
+arch magic_banned
+x 28
+y 33
+end
+arch cobblestones2
+x 28
+y 33
+end
+arch magic_banned
+x 28
+y 34
+end
+arch cobblestones2
+x 28
+y 34
+end
+arch awall_2_1_2
+x 28
+y 34
+end
+arch blocked
+x 28
+y 35
+end
+arch magic_banned
 x 29
 end
 arch cobblestones2
@@ -9777,7 +10757,7 @@ arch cobblestones2
 x 29
 y 3
 end
-arch awall_1_2
+arch awall_2_1_1
 x 29
 y 3
 end
@@ -9789,6 +10769,10 @@ arch cobblestones2
 x 29
 y 4
 end
+arch awall_2_1_1
+x 29
+y 4
+end
 arch magic_banned
 x 29
 y 5
@@ -9797,7 +10781,7 @@ arch cobblestones2
 x 29
 y 5
 end
-arch awall_2_1_2
+arch awall_2_1_1
 x 29
 y 5
 end
@@ -9809,6 +10793,10 @@ arch cobblestones2
 x 29
 y 6
 end
+arch awall_1_2
+x 29
+y 6
+end
 arch magic_banned
 x 29
 y 7
@@ -9817,10 +10805,6 @@ arch cobblestones2
 x 29
 y 7
 end
-arch swall_2_2_3
-x 29
-y 7
-end
 arch magic_banned
 x 29
 y 8
@@ -9829,254 +10813,290 @@ arch cobblestones2
 x 29
 y 8
 end
-arch swall_2_1_1
-x 29
-y 8
-end
-arch magic_banned
-x 29
-y 9
-end
-arch cobblestones2
-x 29
-y 9
-end
-arch swall_2_1_1
-x 29
-y 9
-end
-arch magic_banned
-x 29
-y 10
-end
-arch cobblestones2
-x 29
-y 10
-end
-arch swall_2_2_4
-x 29
-y 10
-end
-arch magic_banned
-x 29
-y 11
-end
-arch cobblestones2
-x 29
-y 11
-end
-arch magic_banned
-x 29
-y 12
-end
-arch cobblestones2
-x 29
-y 12
-end
-arch magic_banned
-x 29
-y 13
-end
-arch cobblestones2
-x 29
-y 13
-end
-arch swall_2_2_3
-x 29
-y 13
-end
-arch magic_banned
-x 29
-y 14
-end
-arch cobblestones2
-x 29
-y 14
-end
-arch swall_2_1_1
-x 29
-y 14
-end
-arch magic_banned
-x 29
-y 15
-end
-arch cobblestones2
-x 29
-y 15
-end
-arch swall_2_1_1
-x 29
-y 15
-end
-arch magic_banned
-x 29
-y 16
-end
-arch cobblestones2
-x 29
-y 16
-end
-arch swall_2_2_4
-x 29
-y 16
-end
-arch magic_banned
-x 29
-y 17
-end
-arch cobblestones2
-x 29
-y 17
-end
-arch magic_banned
-x 29
-y 18
-end
-arch cobblestones2
-x 29
-y 18
-end
-arch magic_banned
-x 29
-y 19
-end
-arch cobblestones2
-x 29
-y 19
-end
-arch swall_2_2_3
-x 29
-y 19
-end
-arch magic_banned
-x 29
-y 20
-end
-arch cobblestones2
-x 29
-y 20
-end
-arch swall_2_1_1
-x 29
-y 20
-end
-arch magic_banned
-x 29
-y 21
-end
-arch cobblestones2
-x 29
-y 21
-end
-arch swall_2_1_1
-x 29
-y 21
-end
-arch magic_banned
-x 29
-y 22
-end
-arch cobblestones2
-x 29
-y 22
-end
-arch swall_2_2_4
-x 29
-y 22
-end
-arch magic_banned
-x 29
-y 23
-end
-arch cobblestones2
-x 29
-y 23
-end
-arch magic_banned
-x 29
-y 24
-end
-arch cobblestones2
-x 29
-y 24
-end
-arch magic_banned
-x 29
-y 25
-end
-arch cobblestones2
-x 29
-y 25
-end
-arch swall_2_2_3
-x 29
-y 25
-end
-arch magic_banned
-x 29
-y 26
-end
-arch cobblestones2
-x 29
-y 26
-end
-arch swall_2_1_1
-x 29
-y 26
-end
-arch magic_banned
-x 29
-y 27
-end
-arch cobblestones2
-x 29
-y 27
-end
-arch swall_2_1_1
-x 29
-y 27
-end
-arch magic_banned
-x 29
-y 28
-end
-arch cobblestones2
-x 29
-y 28
-end
-arch swall_2_2_4
-x 29
-y 28
-end
-arch magic_banned
-x 29
-y 29
-end
-arch cobblestones2
-x 29
-y 29
-end
-arch magic_banned
-x 29
-y 30
-end
-arch cobblestones2
-x 29
-y 30
-end
-arch magic_banned
-x 29
-y 31
-end
-arch cobblestones2
-x 29
-y 31
-end
 arch awall_2_1_2
 x 29
+y 8
+end
+arch magic_banned
+x 29
+y 9
+end
+arch cobblestones2
+x 29
+y 9
+end
+arch magic_banned
+x 29
+y 10
+end
+arch cobblestones2
+x 29
+y 10
+end
+arch swall_2_2_3
+x 29
+y 10
+end
+arch magic_banned
+x 29
+y 11
+end
+arch cobblestones2
+x 29
+y 11
+end
+arch swall_2_1_1
+x 29
+y 11
+end
+arch magic_banned
+x 29
+y 12
+end
+arch cobblestones2
+x 29
+y 12
+end
+arch swall_2_1_1
+x 29
+y 12
+end
+arch magic_banned
+x 29
+y 13
+end
+arch cobblestones2
+x 29
+y 13
+end
+arch swall_2_2_4
+x 29
+y 13
+end
+arch magic_banned
+x 29
+y 14
+end
+arch cobblestones2
+x 29
+y 14
+end
+arch magic_banned
+x 29
+y 15
+end
+arch cobblestones2
+x 29
+y 15
+end
+arch magic_banned
+x 29
+y 16
+end
+arch cobblestones2
+x 29
+y 16
+end
+arch swall_2_2_3
+x 29
+y 16
+end
+arch magic_banned
+x 29
+y 17
+end
+arch cobblestones2
+x 29
+y 17
+end
+arch swall_2_1_1
+x 29
+y 17
+end
+arch magic_banned
+x 29
+y 18
+end
+arch cobblestones2
+x 29
+y 18
+end
+arch swall_2_1_1
+x 29
+y 18
+end
+arch magic_banned
+x 29
+y 19
+end
+arch cobblestones2
+x 29
+y 19
+end
+arch swall_2_2_4
+x 29
+y 19
+end
+arch magic_banned
+x 29
+y 20
+end
+arch cobblestones2
+x 29
+y 20
+end
+arch magic_banned
+x 29
+y 21
+end
+arch cobblestones2
+x 29
+y 21
+end
+arch magic_banned
+x 29
+y 22
+end
+arch cobblestones2
+x 29
+y 22
+end
+arch swall_2_2_3
+x 29
+y 22
+end
+arch magic_banned
+x 29
+y 23
+end
+arch cobblestones2
+x 29
+y 23
+end
+arch swall_2_1_1
+x 29
+y 23
+end
+arch magic_banned
+x 29
+y 24
+end
+arch cobblestones2
+x 29
+y 24
+end
+arch swall_2_1_1
+x 29
+y 24
+end
+arch magic_banned
+x 29
+y 25
+end
+arch cobblestones2
+x 29
+y 25
+end
+arch swall_2_2_4
+x 29
+y 25
+end
+arch magic_banned
+x 29
+y 26
+end
+arch cobblestones2
+x 29
+y 26
+end
+arch magic_banned
+x 29
+y 27
+end
+arch cobblestones2
+x 29
+y 27
+end
+arch magic_banned
+x 29
+y 28
+end
+arch cobblestones2
+x 29
+y 28
+end
+arch swall_2_2_3
+x 29
+y 28
+end
+arch magic_banned
+x 29
+y 29
+end
+arch cobblestones2
+x 29
+y 29
+end
+arch swall_2_1_1
+x 29
+y 29
+end
+arch magic_banned
+x 29
+y 30
+end
+arch cobblestones2
+x 29
+y 30
+end
+arch swall_2_1_1
+x 29
+y 30
+end
+arch magic_banned
+x 29
 y 31
 end
+arch cobblestones2
+x 29
+y 31
+end
+arch swall_2_2_4
+x 29
+y 31
+end
+arch magic_banned
+x 29
+y 32
+end
+arch cobblestones2
+x 29
+y 32
+end
+arch magic_banned
+x 29
+y 33
+end
+arch cobblestones2
+x 29
+y 33
+end
+arch magic_banned
+x 29
+y 34
+end
+arch cobblestones2
+x 29
+y 34
+end
+arch awall_2_1_2
+x 29
+y 34
+end
+arch blocked
+x 29
+y 35
+end
 arch magic_banned
 x 30
 end
@@ -10136,11 +11156,6 @@ y 2
 last_sp 1
 connected 32
 end
-arch pedestal
-x 30
-y 3
-connected 80
-end
 arch magic_banned
 x 30
 y 3
@@ -10149,21 +11164,50 @@ arch cobblestones2
 x 30
 y 3
 end
-arch igateTrg1
+arch magic_banned
 x 30
-y 3
+y 4
+end
+arch cobblestones2
+x 30
+y 4
+end
+arch magic_banned
+x 30
+y 5
+end
+arch cobblestones2
+x 30
+y 5
+end
+arch pedestal
+x 30
+y 6
 connected 80
 end
 arch magic_banned
 x 30
-y 4
+y 6
+end
+arch cobblestones2
+x 30
+y 6
+end
+arch igateTrg1
+x 30
+y 6
+connected 80
+end
+arch magic_banned
+x 30
+y 7
 end
 arch magic_mouth
 msg
 Say the password of Pup Land to enter.
 endmsg
 x 30
-y 4
+y 7
 end
 arch magic_ear
 msg
@@ -10171,47 +11215,23 @@ msg
 Click.
 endmsg
 x 30
-y 4
+y 7
 connected 80
 end
 arch cobblestones2
 x 30
-y 4
+y 7
 end
 arch magic_banned
 x 30
-y 5
+y 8
 end
 arch cobblestones2
 x 30
-y 5
+y 8
 end
 arch awall_2_1_2
 x 30
-y 5
-end
-arch magic_banned
-x 30
-y 6
-end
-arch cobblestones2
-x 30
-y 6
-end
-arch magic_banned
-x 30
-y 7
-end
-arch cobblestones2
-x 30
-y 7
-end
-arch magic_banned
-x 30
-y 8
-end
-arch cobblestones2
-x 30
 y 8
 end
 arch magic_banned
@@ -10222,26 +11242,6 @@ arch cobblestones2
 x 30
 y 9
 end
-arch cobblestones2
-x 30
-y 9
-end
-arch magic_banned
-x 30
-y 9
-end
-arch cobblestones2
-x 30
-y 9
-end
-arch magic_banned
-x 30
-y 10
-end
-arch cobblestones2
-x 30
-y 10
-end
 arch magic_banned
 x 30
 y 10
@@ -10266,6 +11266,26 @@ arch cobblestones2
 x 30
 y 12
 end
+arch cobblestones2
+x 30
+y 12
+end
+arch magic_banned
+x 30
+y 12
+end
+arch cobblestones2
+x 30
+y 12
+end
+arch magic_banned
+x 30
+y 13
+end
+arch cobblestones2
+x 30
+y 13
+end
 arch magic_banned
 x 30
 y 13
@@ -10418,9 +11438,37 @@ arch cobblestones2
 x 30
 y 31
 end
+arch magic_banned
+x 30
+y 32
+end
+arch cobblestones2
+x 30
+y 32
+end
+arch magic_banned
+x 30
+y 33
+end
+arch cobblestones2
+x 30
+y 33
+end
+arch magic_banned
+x 30
+y 34
+end
+arch cobblestones2
+x 30
+y 34
+end
 arch awall_2_1_2
 x 30
-y 31
+y 34
+end
+arch blocked
+x 30
+y 35
 end
 arch magic_banned
 x 31
@@ -10487,7 +11535,7 @@ arch cobblestones2
 x 31
 y 5
 end
-arch awall_3_4
+arch awall_2_1_1
 x 31
 y 5
 end
@@ -10523,7 +11571,7 @@ arch cobblestones2
 x 31
 y 8
 end
-arch awall_2_1_1
+arch awall_3_4
 x 31
 y 8
 end
@@ -10799,10 +11847,50 @@ arch cobblestones2
 x 31
 y 31
 end
-arch awall_2_2_4
+arch awall_2_1_1
 x 31
 y 31
 end
+arch magic_banned
+x 31
+y 32
+end
+arch cobblestones2
+x 31
+y 32
+end
+arch awall_2_1_1
+x 31
+y 32
+end
+arch magic_banned
+x 31
+y 33
+end
+arch cobblestones2
+x 31
+y 33
+end
+arch awall_2_1_1
+x 31
+y 33
+end
+arch magic_banned
+x 31
+y 34
+end
+arch cobblestones2
+x 31
+y 34
+end
+arch awall_2_2_4
+x 31
+y 34
+end
+arch blocked
+x 31
+y 35
+end
 arch blocked
 x 32
 end
@@ -10931,6 +12019,22 @@ x 32
 y 31
 end
 arch blocked
+x 32
+y 32
+end
+arch blocked
+x 32
+y 33
+end
+arch blocked
+x 32
+y 34
+end
+arch blocked
+x 32
+y 35
+end
+arch blocked
 x 33
 end
 arch pit_closed
diff --git a/dragonisland/hangar2 b/dragonisland/hangar2
index 6e5726017..db3775895 100644
--- a/dragonisland/hangar2
+++ b/dragonisland/hangar2
@@ -8,7 +8,7 @@ enter_x 15
 enter_y 30
 msg
 Created:  2001-03-06 Philipp Currlin (philipp.currlin@epost.de)
-Modified: 2013-07-14 kevinz
+Modified: 2014-12-28 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -2835,7 +2835,7 @@ end
 arch stair_up_2
 slaying hangar
 hp 15
-sp 30
+sp 33
 x 15
 y 30
 end
@@ -3046,7 +3046,7 @@ end
 arch stair_up_4
 slaying hangar
 hp 16
-sp 30
+sp 33
 x 16
 y 30
 end