From 0487248b1f23a8a86429950a09ddd0d844f803f9 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 13 Sep 2011 04:41:07 +0000
Subject: [PATCH] Updated Goth's Taven in Scorn so that the map exterior
 matches it's placement in the world map.  Updated world map for new entrance
 destination to the Tavern.  Updated stair coordiantes on the upper and lower
 level of the Tavern so that they line up with the other levels.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15088 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/taverns/goths  | 7446 ++++++++++++++++++++++++------------------
 scorn/taverns/goths0 |    6 +-
 scorn/taverns/goths2 |    6 +-
 world/world_105_115  |    4 +-
 4 files changed, 4354 insertions(+), 3108 deletions(-)

diff --git a/scorn/taverns/goths b/scorn/taverns/goths
index 7bb1bda03..ba0cfc7b8 100644
--- a/scorn/taverns/goths
+++ b/scorn/taverns/goths
@@ -3,8 +3,8 @@ name Goth's Tavern
 reset_timeout 1800
 difficulty 1
 region scorn
-width 34
-height 33
+width 38
+height 37
 enter_x 18
 enter_y 32
 msg
@@ -16,241 +16,590 @@ maplore
 the dragon emissary is here, and will give hints to find the dragon lair
 endmaplore
 end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch cobblestones2
+y 17
+end
+arch cobblestones2
+y 18
+end
+arch cobblestones2
+y 19
+end
+arch cobblestones2
+y 20
+end
+arch cobblestones2
+y 21
+end
+arch cobblestones2
+y 22
+end
+arch cobblestones2
+y 23
+end
+arch cobblestones2
+y 24
+end
+arch cobblestones2
+y 25
+end
+arch cobblestones2
+y 26
+end
+arch cobblestones2
+y 27
+end
+arch cobblestones2
+y 28
+end
+arch cobblestones2
+y 29
+end
+arch cobblestones2
+y 30
+end
+arch cobblestones2
+y 31
+end
+arch cobblestones2
+y 32
+end
+arch cobblestones2
+y 33
+end
+arch cobblestones2
+y 34
+end
+arch cobblestones2
+y 35
+end
+arch cobblestones2
+y 36
+end
+arch cobblestones2
+x 1
+end
+arch cobblestones2
+x 1
+y 1
+end
+arch cobblestones2
+x 1
+y 2
+end
+arch cobblestones2
+x 1
+y 3
+end
+arch cobblestones2
+x 1
+y 4
+end
+arch cobblestones2
+x 1
+y 5
+end
+arch cobblestones2
+x 1
+y 6
+end
+arch cobblestones2
+x 1
+y 7
+end
+arch cobblestones2
+x 1
+y 8
+end
+arch cobblestones2
+x 1
+y 9
+end
+arch cobblestones2
+x 1
+y 10
+end
+arch cobblestones2
+x 1
+y 11
+end
+arch cobblestones2
+x 1
+y 12
+end
+arch cobblestones2
+x 1
+y 13
+end
+arch cobblestones2
+x 1
+y 14
+end
+arch cobblestones2
+x 1
+y 15
+end
+arch cobblestones2
+x 1
+y 16
+end
+arch cobblestones2
+x 1
+y 17
+end
+arch cobblestones2
+x 1
+y 18
+end
+arch cobblestones2
+x 1
+y 19
+end
+arch cobblestones2
+x 1
+y 20
+end
+arch cobblestones2
+x 1
+y 21
+end
+arch cobblestones2
+x 1
+y 22
+end
+arch cobblestones2
+x 1
+y 23
+end
+arch cobblestones2
+x 1
+y 24
+end
+arch cobblestones2
+x 1
+y 25
+end
+arch cobblestones2
+x 1
+y 26
+end
+arch cobblestones2
+x 1
+y 27
+end
+arch cobblestones2
+x 1
+y 28
+end
+arch cobblestones2
+x 1
+y 29
+end
+arch cobblestones2
+x 1
+y 30
+end
+arch cobblestones2
+x 1
+y 31
+end
+arch cobblestones2
+x 1
+y 32
+end
+arch cobblestones2
+x 1
+y 33
+end
+arch cobblestones2
+x 1
+y 34
+end
+arch cobblestones2
+x 1
+y 35
+end
+arch cobblestones2
+x 1
+y 36
+end
+arch cobblestones2
+x 2
+end
+arch cobblestones2
+x 2
+y 1
+end
 arch woodfloor
+x 2
+y 2
 end
 arch wall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch wall_2_1_1
-y 1
-end
-arch woodfloor
-y 2
-end
-arch wall_2_1_1
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
-arch wall_3_2
+arch wall_2_1_1
+x 2
 y 3
 end
 arch woodfloor
+x 2
 y 4
 end
 arch wall_2_1_1
+x 2
 y 4
 end
 arch woodfloor
+x 2
 y 5
 end
-arch wall_2_1_1
-y 5
-end
-arch woodfloor
-y 6
-end
-arch wall_2_1_1
-y 6
-end
-arch woodfloor
-y 7
-end
-arch wall_2_1_1
-y 7
-end
-arch woodfloor
-y 8
-end
-arch wall_2_1_1
-y 8
-end
-arch woodfloor
-y 9
-end
-arch wall_2_1_1
-y 9
-end
-arch woodfloor
-y 10
-end
-arch wall_2_1_1
-y 10
-end
-arch woodfloor
-y 11
-end
-arch wall_2_1_1
-y 11
-end
-arch woodfloor
-y 12
-end
-arch wall_2_1_1
-y 12
-end
-arch woodfloor
-y 13
-end
-arch wall_2_1_1
-y 13
-end
-arch woodfloor
-y 14
-end
-arch wall_2_1_1
-y 14
-end
-arch woodfloor
-y 15
-end
-arch wall_2_1_1
-y 15
-end
-arch woodfloor
-y 16
-end
-arch wall_2_1_1
-y 16
-end
-arch woodfloor
-y 17
-end
-arch wall_2_1_1
-y 17
-end
-arch woodfloor
-y 18
-end
-arch wall_2_1_1
-y 18
-end
-arch woodfloor
-y 19
-end
-arch wall_2_1_1
-y 19
-end
-arch woodfloor
-y 20
-end
 arch wall_3_2
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch wall_2_1_1
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch wall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
+arch wall_2_1_1
+x 2
+y 8
+end
+arch woodfloor
+x 2
+y 9
+end
+arch wall_2_1_1
+x 2
+y 9
+end
+arch woodfloor
+x 2
+y 10
+end
+arch wall_2_1_1
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch wall_2_1_1
+x 2
+y 11
+end
+arch woodfloor
+x 2
+y 12
+end
+arch wall_2_1_1
+x 2
+y 12
+end
+arch woodfloor
+x 2
+y 13
+end
+arch wall_2_1_1
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
+arch wall_2_1_1
+x 2
+y 14
+end
+arch woodfloor
+x 2
+y 15
+end
+arch wall_2_1_1
+x 2
+y 15
+end
+arch woodfloor
+x 2
+y 16
+end
+arch wall_2_1_1
+x 2
+y 16
+end
+arch woodfloor
+x 2
+y 17
+end
+arch wall_2_1_1
+x 2
+y 17
+end
+arch woodfloor
+x 2
+y 18
+end
+arch wall_2_1_1
+x 2
+y 18
+end
+arch woodfloor
+x 2
+y 19
+end
+arch wall_2_1_1
+x 2
+y 19
+end
+arch woodfloor
+x 2
+y 20
+end
+arch wall_2_1_1
+x 2
 y 20
 end
 arch woodfloor
+x 2
 y 21
 end
 arch wall_2_1_1
+x 2
 y 21
 end
 arch woodfloor
+x 2
 y 22
 end
-arch wall_2_1_1
+arch wall_3_2
+x 2
 y 22
 end
 arch woodfloor
+x 2
 y 23
 end
 arch wall_2_1_1
+x 2
 y 23
 end
 arch woodfloor
+x 2
 y 24
 end
 arch wall_2_1_1
+x 2
 y 24
 end
 arch woodfloor
+x 2
 y 25
 end
 arch wall_2_1_1
+x 2
 y 25
 end
 arch woodfloor
+x 2
 y 26
 end
 arch wall_2_1_1
+x 2
 y 26
 end
 arch woodfloor
+x 2
 y 27
 end
 arch wall_2_1_1
+x 2
 y 27
 end
 arch woodfloor
+x 2
 y 28
 end
 arch wall_2_1_1
+x 2
 y 28
 end
 arch woodfloor
+x 2
 y 29
 end
 arch wall_2_1_1
+x 2
 y 29
 end
 arch woodfloor
+x 2
 y 30
 end
 arch wall_2_1_1
+x 2
 y 30
 end
 arch woodfloor
+x 2
 y 31
 end
 arch wall_2_1_1
+x 2
 y 31
 end
 arch woodfloor
+x 2
 y 32
 end
+arch wall_2_1_1
+x 2
+y 32
+end
+arch woodfloor
+x 2
+y 33
+end
+arch wall_2_1_1
+x 2
+y 33
+end
+arch woodfloor
+x 2
+y 34
+end
 arch wall_2_2_1
-y 32
+x 2
+y 34
 end
-arch woodfloor
-x 1
+arch cobblestones2
+x 2
+y 35
 end
-arch wall_2_1_2
-x 1
+arch cobblestones2
+x 2
+y 36
 end
-arch woodfloor
-x 1
+arch cobblestones2
+x 3
+end
+arch cobblestones2
+x 3
 y 1
 end
-arch button_small
-x 1
+arch woodfloor
+x 3
 y 2
+end
+arch wall_2_1_2
+x 3
+y 2
+end
+arch woodfloor
+x 3
+y 3
+end
+arch button_small
+x 3
+y 4
 connected 1
 end
 arch woodfloor
-x 1
-y 2
-end
-arch woodfloor
-x 1
-y 3
-end
-arch wall_1_3
-x 1
-y 3
-end
-arch woodfloor
-x 1
+x 3
 y 4
 end
 arch woodfloor
-x 1
+x 3
+y 5
+end
+arch wall_1_3
+x 3
 y 5
 end
 arch woodfloor
-x 1
+x 3
 y 6
 end
+arch woodfloor
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
 arch man
 name Drunk
 msg
@@ -268,8 +617,8 @@ Yeah, if you get me some, I'll do you a favor.
 @match *
 Beer helps me on the job...
 endmsg
-x 1
-y 6
+x 3
+y 8
 friendly 1
 unaggressive 0
 end
@@ -279,39 +628,39 @@ msg
 Click! The gate has opened...
 endmsg
 food 1
-x 1
-y 7
+x 3
+y 9
 invisible 1
 connected 1
 end
 arch woodfloor
-x 1
-y 7
+x 3
+y 9
 end
 arch table_4
-x 1
-y 7
+x 3
+y 9
 no_pick 1
 end
 arch boozebottle_empty
-x 1
-y 7
-end
-arch woodfloor
-x 1
-y 8
-end
-arch woodfloor
-x 1
+x 3
 y 9
 end
 arch woodfloor
-x 1
+x 3
 y 10
 end
+arch woodfloor
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
+end
 arch chair_1.4
-x 1
-y 10
+x 3
+y 12
 end
 arch merchant
 name Bragh O'Leary
@@ -333,26 +682,26 @@ Anyway, ask around in the taverns in them towns.  Some'n there will be able to a
 @match *
 (hic) Leave me be.  Kin ye no see I be drinkin'!?
 endmsg
-x 1
-y 10
+x 3
+y 12
 friendly 1
 end
 arch woodfloor
-x 1
-y 11
-end
-arch woodfloor
-x 1
-y 12
-end
-arch woodfloor
-x 1
+x 3
 y 13
 end
 arch woodfloor
-x 1
+x 3
 y 14
 end
+arch woodfloor
+x 3
+y 15
+end
+arch woodfloor
+x 3
+y 16
+end
 arch magic_ear
 msg
 @match hard
@@ -361,8 +710,8 @@ You need a strong fighter along on the quest:  their god has granted their praye
 I battled one of their adepts for a time.  He had such incredible reserves of power that I had to withdraw from the fight.  I'm sure that he must have had a Power Crystal.
 The Temple is in a Dark Forest just north of the Great East Road.
 endmsg
-x 1
-y 14
+x 3
+y 16
 end
 arch magic_ear
 msg
@@ -371,8 +720,8 @@ Well, if you're past the 9th Tier in your guilds, and you have some strong frien
 'e got his hands on a new spell, he does, and he's abusing it.  Turned to evil for sure, he has.  I've heard what some of his former servants have said about him.  If his soul doesn't belong to the Dark already, it will soon.
 He resides in the Tower of the Stars, which is south of Scorn.  It's hard going to get there.
 endmsg
-x 1
-y 14
+x 3
+y 16
 end
 arch magic_ear
 msg
@@ -381,8 +730,8 @@ Okay, if you're not past the 5th rank, then you'll probably be very happy to do
 The pirates are getting uppity:  this used to be a respectable town, and they're getting out of hand.  Go look around in some of the buildings near the docks, there are unsavory sorts running amok up there who should be taught good behavior!
 There's also supposed to be a pirate treasure on some islands you can get to if you take passage on a pirate ship, but they seem to have moved their base over near Wolfsburg.
 endmsg
-x 1
-y 14
+x 3
+y 16
 end
 arch wizard
 msg
@@ -406,8 +755,8 @@ exp 2000
 dam 10
 wc 10
 ac -3
-x 1
-y 14
+x 3
+y 16
 level 10
 type 0
 resist_magic 30
@@ -417,34 +766,34 @@ friendly 1
 can_cast_spell 1
 end
 arch woodfloor
-x 1
-y 15
-end
-arch woodfloor
-x 1
-y 16
-end
-arch woodfloor
-x 1
+x 3
 y 17
 end
+arch woodfloor
+x 3
+y 18
+end
+arch woodfloor
+x 3
+y 19
+end
 arch magic_ear
 msg
 @match mountain
 I'll never forget that mountain.  I fought a battle atop it with a dark spirit.  His evil had begun to poison the land around his lair, so I challenged him to battle.
 When he issued forth from his cave to do battle with me, I rose up into the air above him, and blasted him with fire.  He somehow survived that first blast, so I threw yet a greater at him.  He survived that one too, so I stretched myself.  The next blast of fire scorched the mountain black (it remains so to this day).  Yet still he stood against me, so I thought he must somehow be immune.  Using the last of my strength, I blasted him with lightning.  He was destroyed, but I never looked into his cave.
 endmsg
-x 1
-y 18
+x 3
+y 20
 connected 7
 end
 arch woodfloor
-x 1
-y 18
+x 3
+y 20
 end
 arch chair_1.4
-x 1
-y 18
+x 3
+y 20
 end
 arch magic_ear
 msg
@@ -454,13 +803,13 @@ Well, Morkov, the former Wizard there, has turned to darkness.  He's out-and-out
 Kill him and take his Sword.  He got it when he betrayed Navar and opened a gate for Evil to come through.  The flood of undead has taken over his Tower already.
 The idiot city council there hasn't taken action yet.  Perhaps they're waiting for someone of the 13th or 14th Tier in their guilds to go kick Morkov out.
 endmsg
-x 1
-y 19
+x 3
+y 21
 connected 7
 end
 arch woodfloor
-x 1
-y 19
+x 3
+y 21
 end
 arch wizard
 name wizard with an aura of great power
@@ -485,8 +834,8 @@ hp 10000
 exp 500
 dam 50
 wc -5
-x 1
-y 19
+x 3
+y 21
 speed 1.500000
 level 49
 type 0
@@ -516,197 +865,214 @@ can_use_armour 0
 can_use_weapon 0
 end
 arch woodfloor
-x 1
-y 20
+x 3
+y 22
 end
 arch wall_2_1_2
-x 1
-y 20
-end
-arch woodfloor
-x 1
-y 21
-end
-arch cwall_0
-x 1
-y 21
-end
-arch woodfloor
-x 1
+x 3
 y 22
 end
 arch woodfloor
-x 1
+x 3
+y 23
+end
+arch cwall_0
+x 3
 y 23
 end
 arch woodfloor
-x 1
+x 3
 y 24
 end
 arch woodfloor
-x 1
+x 3
 y 25
 end
 arch woodfloor
-x 1
-y 26
-end
-arch cwall_0
-x 1
+x 3
 y 26
 end
 arch woodfloor
-x 1
+x 3
 y 27
 end
 arch woodfloor
-x 1
+x 3
+y 28
+end
+arch cwall_0
+x 3
 y 28
 end
 arch woodfloor
-x 1
+x 3
 y 29
 end
 arch woodfloor
-x 1
+x 3
 y 30
 end
 arch woodfloor
-x 1
+x 3
 y 31
 end
+arch woodfloor
+x 3
+y 32
+end
+arch woodfloor
+x 3
+y 33
+end
 arch cwall_0
-x 1
-y 31
+x 3
+y 33
 end
 arch woodfloor
-x 1
-y 32
+x 3
+y 34
 end
 arch wall_2_1_2
-x 1
-y 32
+x 3
+y 34
 end
-arch woodfloor
-x 2
+arch cobblestones2
+x 3
+y 35
 end
-arch wall_2_1_2
-x 2
+arch cobblestones2
+x 3
+y 36
 end
-arch woodfloor
-x 2
+arch cobblestones2
+x 4
+end
+arch cobblestones2
+x 4
 y 1
 end
+arch woodfloor
+x 4
+y 2
+end
+arch wall_2_1_2
+x 4
+y 2
+end
+arch woodfloor
+x 4
+y 3
+end
 arch stair_down
 name Stairs to the Cellar
 slaying goths0
 hp 4
 sp 1
-x 2
-y 1
+x 4
+y 3
 end
 arch button_small
-x 2
-y 2
+x 4
+y 4
 connected 1
 end
 arch woodfloor
-x 2
-y 2
+x 4
+y 4
 end
 arch button_small
-x 2
-y 3
+x 4
+y 5
 connected 1
 end
 arch woodfloor
-x 2
-y 3
+x 4
+y 5
 end
 arch igate_closed_1
-x 2
-y 3
+x 4
+y 5
 speed 0.500000
 connected 1
 end
 arch woodfloor
-x 2
-y 4
-end
-arch woodfloor
-x 2
-y 5
-end
-arch woodfloor
-x 2
+x 4
 y 6
 end
 arch woodfloor
-x 2
+x 4
 y 7
 end
 arch woodfloor
-x 2
+x 4
 y 8
 end
 arch woodfloor
-x 2
-y 9
-end
-arch chair_1.1
-x 2
+x 4
 y 9
 end
 arch woodfloor
-x 2
+x 4
 y 10
 end
+arch woodfloor
+x 4
+y 11
+end
+arch chair_1.1
+x 4
+y 11
+end
+arch woodfloor
+x 4
+y 12
+end
 arch table_3
-x 2
-y 10
+x 4
+y 12
 end
 arch booze
-x 2
-y 10
+x 4
+y 12
 map_layer item
 no_pick 1
 end
 arch woodfloor
-x 2
-y 11
+x 4
+y 13
 end
 arch chair_1.3
-x 2
-y 11
-end
-arch woodfloor
-x 2
-y 12
-end
-arch woodfloor
-x 2
+x 4
 y 13
 end
 arch woodfloor
-x 2
-y 14
-end
-arch table_3
-x 2
+x 4
 y 14
 end
 arch woodfloor
-x 2
+x 4
 y 15
 end
 arch woodfloor
-x 2
+x 4
+y 16
+end
+arch table_3
+x 4
 y 16
 end
 arch woodfloor
-x 2
+x 4
 y 17
 end
+arch woodfloor
+x 4
+y 18
+end
+arch woodfloor
+x 4
+y 19
+end
 arch magic_ear
 msg
 @match cave
@@ -715,237 +1081,270 @@ After the battle, the mountain was far too hot to be near, and I've had better t
 I don't think you'll be able to pass his vicious pets unless you're at least 15th Tier in your guild.
 The mountain can be found north of the bend in the Great East Road.
 endmsg
-x 2
-y 18
+x 4
+y 20
 connected 7
 end
 arch woodfloor
-x 2
-y 18
+x 4
+y 20
 end
 arch table_3
-x 2
-y 18
+x 4
+y 20
 end
 arch magic_ear
 msg
 @match fubar
 baz
 endmsg
-x 2
-y 19
+x 4
+y 21
 connected 7
 end
 arch woodfloor
-x 2
-y 19
+x 4
+y 21
 end
 arch chair_1.3
-x 2
-y 19
-end
-arch woodfloor
-x 2
-y 20
-end
-arch wall_2_1_2
-x 2
-y 20
-end
-arch woodfloor
-x 2
+x 4
 y 21
 end
 arch woodfloor
-x 2
+x 4
+y 22
+end
+arch wall_2_1_2
+x 4
 y 22
 end
 arch woodfloor
-x 2
+x 4
 y 23
 end
 arch woodfloor
-x 2
+x 4
 y 24
 end
 arch woodfloor
-x 2
+x 4
 y 25
 end
 arch woodfloor
-x 2
+x 4
 y 26
 end
 arch woodfloor
-x 2
+x 4
 y 27
 end
 arch woodfloor
-x 2
+x 4
 y 28
 end
 arch woodfloor
-x 2
+x 4
 y 29
 end
 arch woodfloor
-x 2
+x 4
 y 30
 end
 arch woodfloor
-x 2
+x 4
 y 31
 end
 arch woodfloor
-x 2
+x 4
 y 32
 end
-arch wall_1_3
-x 2
-y 32
-end
-arch woodfloor
-x 3
-end
-arch wall_2_1_2
-x 3
-end
-arch woodfloor
-x 3
-y 1
-end
 arch button_small
-x 3
+x 4
+y 33
+connected 2
+end
+arch woodfloor
+x 4
+y 33
+end
+arch woodfloor
+x 4
+y 34
+end
+arch wall_1_3
+x 4
+y 34
+end
+arch dungeon_magic
+x 4
+y 35
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 19
+sp 35
+x 4
+y 35
+end
+arch cobblestones2
+x 4
+y 35
+end
+arch cobblestones2
+x 4
+y 36
+end
+arch cobblestones2
+x 5
+end
+arch cobblestones2
+x 5
+y 1
+end
+arch woodfloor
+x 5
 y 2
+end
+arch wall_2_1_2
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch button_small
+x 5
+y 4
 connected 1
 end
 arch woodfloor
-x 3
-y 2
-end
-arch woodfloor
-x 3
-y 3
-end
-arch wall_1_4
-x 3
-y 3
-end
-arch woodfloor
-x 3
+x 5
 y 4
 end
 arch woodfloor
-x 3
+x 5
+y 5
+end
+arch wall_1_4
+x 5
 y 5
 end
 arch woodfloor
-x 3
+x 5
 y 6
 end
 arch woodfloor
-x 3
+x 5
 y 7
 end
 arch woodfloor
-x 3
+x 5
 y 8
 end
 arch woodfloor
-x 3
+x 5
 y 9
 end
 arch woodfloor
-x 3
-y 10
-end
-arch chair_1.2
-x 3
+x 5
 y 10
 end
 arch woodfloor
-x 3
+x 5
 y 11
 end
 arch woodfloor
-x 3
+x 5
+y 12
+end
+arch chair_1.2
+x 5
 y 12
 end
 arch woodfloor
-x 3
+x 5
 y 13
 end
 arch woodfloor
-x 3
-y 14
-end
-arch chair_1.2
-x 3
+x 5
 y 14
 end
 arch woodfloor
-x 3
+x 5
 y 15
 end
 arch woodfloor
-x 3
+x 5
+y 16
+end
+arch chair_1.2
+x 5
 y 16
 end
 arch woodfloor
-x 3
+x 5
 y 17
 end
 arch woodfloor
-x 3
+x 5
 y 18
 end
 arch woodfloor
-x 3
+x 5
 y 19
 end
 arch woodfloor
-x 3
-y 20
-end
-arch wall_2_1_2
-x 3
+x 5
 y 20
 end
 arch woodfloor
-x 3
+x 5
 y 21
 end
 arch woodfloor
-x 3
+x 5
+y 22
+end
+arch wall_2_1_2
+x 5
 y 22
 end
 arch woodfloor
-x 3
+x 5
 y 23
 end
 arch woodfloor
-x 3
+x 5
 y 24
 end
 arch woodfloor
-x 3
+x 5
 y 25
 end
 arch woodfloor
-x 3
+x 5
 y 26
 end
 arch woodfloor
-x 3
+x 5
 y 27
 end
+arch woodfloor
+x 5
+y 28
+end
+arch woodfloor
+x 5
+y 29
+end
 arch man
 msg
 @match *
 Howdy
 endmsg
-x 3
-y 27
+x 5
+y 29
 friendly 1
 unaggressive 0
 arch event_say
@@ -955,201 +1354,270 @@ slaying /python/IPO/seen.py
 end
 end
 arch woodfloor
-x 3
-y 28
-end
-arch woodfloor
-x 3
-y 29
-end
-arch woodfloor
-x 3
+x 5
 y 30
 end
 arch woodfloor
-x 3
+x 5
 y 31
 end
 arch woodfloor
-x 3
+x 5
 y 32
 end
-arch oakdoor_2
+arch button_small
+x 5
+y 33
+connected 2
+end
+arch woodfloor
+x 5
+y 33
+end
+arch button_small
+x 5
+y 34
+connected 2
+end
+arch woodfloor
+x 5
+y 34
+end
+arch odoorn2_closed_1
+x 5
+y 34
+connected 2
+end
+arch dungeon_magic
+x 5
+y 35
+end
+arch invis_exit
 slaying /world/world_105_115
 hp 19
 sp 35
-x 3
-y 32
+x 5
+y 35
+end
+arch cobblestones2
+x 5
+y 35
+end
+arch cobblestones2
+x 5
+y 36
+end
+arch cobblestones2
+x 6
+end
+arch cobblestones2
+x 6
+y 1
 end
 arch woodfloor
-x 4
+x 6
+y 2
 end
 arch wall_3_3
-x 4
-end
-arch woodfloor
-x 4
-y 1
-end
-arch wall_2_1_1
-x 4
-y 1
-end
-arch woodfloor
-x 4
-y 2
-end
-arch wall_2_1_1
-x 4
+x 6
 y 2
 end
 arch woodfloor
-x 4
+x 6
 y 3
 end
-arch wall_2_2_4
-x 4
+arch wall_2_1_1
+x 6
 y 3
 end
 arch woodfloor
-x 4
+x 6
+y 4
+end
+arch wall_2_1_1
+x 6
 y 4
 end
 arch woodfloor
-x 4
+x 6
+y 5
+end
+arch wall_2_2_4
+x 6
 y 5
 end
 arch woodfloor
-x 4
+x 6
 y 6
 end
 arch woodfloor
-x 4
+x 6
 y 7
 end
 arch woodfloor
-x 4
+x 6
 y 8
 end
 arch woodfloor
-x 4
+x 6
 y 9
 end
 arch woodfloor
-x 4
+x 6
 y 10
 end
 arch woodfloor
-x 4
+x 6
 y 11
 end
 arch woodfloor
-x 4
+x 6
 y 12
 end
 arch woodfloor
-x 4
+x 6
 y 13
 end
 arch woodfloor
-x 4
+x 6
 y 14
 end
 arch woodfloor
-x 4
+x 6
 y 15
 end
 arch woodfloor
-x 4
+x 6
 y 16
 end
 arch woodfloor
-x 4
+x 6
 y 17
 end
 arch woodfloor
-x 4
+x 6
 y 18
 end
 arch woodfloor
-x 4
+x 6
 y 19
 end
 arch woodfloor
-x 4
-y 20
-end
-arch wall_1_3
-x 4
+x 6
 y 20
 end
 arch woodfloor
-x 4
+x 6
 y 21
 end
 arch woodfloor
-x 4
+x 6
+y 22
+end
+arch wall_1_3
+x 6
 y 22
 end
 arch woodfloor
-x 4
+x 6
 y 23
 end
 arch woodfloor
-x 4
+x 6
 y 24
 end
 arch woodfloor
-x 4
+x 6
 y 25
 end
 arch woodfloor
-x 4
+x 6
 y 26
 end
 arch woodfloor
-x 4
+x 6
 y 27
 end
 arch woodfloor
-x 4
+x 6
 y 28
 end
 arch woodfloor
-x 4
+x 6
 y 29
 end
 arch woodfloor
-x 4
+x 6
 y 30
 end
 arch woodfloor
-x 4
+x 6
 y 31
 end
 arch woodfloor
-x 4
+x 6
 y 32
 end
+arch button_small
+x 6
+y 33
+connected 2
+end
+arch woodfloor
+x 6
+y 33
+end
+arch woodfloor
+x 6
+y 34
+end
 arch wall_1_4
-x 4
-y 32
+x 6
+y 34
+end
+arch dungeon_magic
+x 6
+y 35
+end
+arch invis_exit
+slaying /world/world_105_115
+hp 19
+sp 35
+x 6
+y 35
+end
+arch cobblestones2
+x 6
+y 35
+end
+arch cobblestones2
+x 6
+y 36
+end
+arch cobblestones2
+x 7
+end
+arch cobblestones2
+x 7
+y 1
 end
 arch woodfloor
-x 5
+x 7
+y 2
 end
 arch wall_2_1_2
-x 5
+x 7
+y 2
 end
 arch woodfloor
-x 5
-y 1
+x 7
+y 3
 end
 arch slotmachine2
 name Gerty Gold
 food 0
-x 5
-y 1
+x 7
+y 3
 arch event_apply
 name event_apply
 title Python
@@ -1157,299 +1625,333 @@ slaying /python/casino/goldslots.py
 end
 end
 arch woodfloor
-x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch woodfloor
-x 5
+x 7
 y 4
 end
 arch woodfloor
-x 5
+x 7
 y 5
 end
 arch woodfloor
-x 5
+x 7
 y 6
 end
 arch woodfloor
-x 5
+x 7
 y 7
 end
 arch woodfloor
-x 5
+x 7
 y 8
 end
 arch woodfloor
-x 5
+x 7
 y 9
 end
 arch woodfloor
-x 5
+x 7
 y 10
 end
 arch woodfloor
-x 5
+x 7
 y 11
 end
 arch woodfloor
-x 5
+x 7
 y 12
 end
 arch woodfloor
-x 5
+x 7
 y 13
 end
 arch woodfloor
-x 5
+x 7
 y 14
 end
 arch woodfloor
-x 5
+x 7
 y 15
 end
 arch woodfloor
-x 5
+x 7
 y 16
 end
 arch woodfloor
-x 5
-y 17
-end
-arch a_townsman
-x 5
+x 7
 y 17
 end
 arch woodfloor
-x 5
+x 7
 y 18
 end
 arch woodfloor
-x 5
+x 7
+y 19
+end
+arch a_townsman
+x 7
 y 19
 end
 arch woodfloor
-x 5
+x 7
 y 20
 end
 arch woodfloor
-x 5
+x 7
 y 21
 end
 arch woodfloor
-x 5
+x 7
 y 22
 end
 arch woodfloor
-x 5
+x 7
 y 23
 end
 arch woodfloor
-x 5
+x 7
 y 24
 end
 arch woodfloor
-x 5
+x 7
 y 25
 end
 arch woodfloor
-x 5
+x 7
 y 26
 end
 arch woodfloor
-x 5
+x 7
 y 27
 end
 arch woodfloor
-x 5
+x 7
 y 28
 end
 arch woodfloor
-x 5
+x 7
 y 29
 end
 arch woodfloor
-x 5
+x 7
 y 30
 end
 arch woodfloor
-x 5
+x 7
 y 31
 end
 arch woodfloor
-x 5
-y 32
-end
-arch wall_2_1_2
-x 5
+x 7
 y 32
 end
 arch woodfloor
-x 6
-end
-arch wall_2_1_2
-x 6
+x 7
+y 33
 end
 arch woodfloor
-x 6
+x 7
+y 34
+end
+arch wall_2_1_2
+x 7
+y 34
+end
+arch cobblestones2
+x 7
+y 35
+end
+arch cobblestones2
+x 7
+y 36
+end
+arch cobblestones2
+x 8
+end
+arch cobblestones2
+x 8
 y 1
 end
+arch woodfloor
+x 8
+y 2
+end
+arch wall_2_1_2
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
 arch sign
 msg
 Presenting the Lucky Lady Slots - Courtesy of Casino Infernal
 Pull the handle and try your luck.
 Please visit our Casino in Navar!
 endmsg
-x 6
-y 1
-end
-arch woodfloor
-x 6
-y 2
-end
-arch woodfloor
-x 6
+x 8
 y 3
 end
 arch woodfloor
-x 6
+x 8
 y 4
 end
 arch woodfloor
-x 6
+x 8
 y 5
 end
 arch woodfloor
-x 6
+x 8
 y 6
 end
 arch woodfloor
-x 6
+x 8
 y 7
 end
 arch woodfloor
-x 6
+x 8
 y 8
 end
 arch woodfloor
-x 6
+x 8
 y 9
 end
 arch woodfloor
-x 6
+x 8
 y 10
 end
 arch woodfloor
-x 6
+x 8
 y 11
 end
 arch woodfloor
-x 6
+x 8
 y 12
 end
 arch woodfloor
-x 6
+x 8
 y 13
 end
 arch woodfloor
-x 6
+x 8
 y 14
 end
 arch woodfloor
-x 6
+x 8
 y 15
 end
 arch woodfloor
-x 6
+x 8
 y 16
 end
 arch woodfloor
-x 6
+x 8
 y 17
 end
 arch woodfloor
-x 6
+x 8
 y 18
 end
 arch woodfloor
-x 6
+x 8
 y 19
 end
 arch woodfloor
-x 6
+x 8
 y 20
 end
 arch woodfloor
-x 6
+x 8
 y 21
 end
 arch woodfloor
-x 6
+x 8
 y 22
 end
 arch woodfloor
-x 6
+x 8
 y 23
 end
 arch woodfloor
-x 6
+x 8
 y 24
 end
 arch woodfloor
-x 6
+x 8
 y 25
 end
 arch woodfloor
-x 6
+x 8
 y 26
 end
 arch woodfloor
-x 6
+x 8
 y 27
 end
 arch woodfloor
-x 6
+x 8
 y 28
 end
 arch woodfloor
-x 6
+x 8
 y 29
 end
 arch woodfloor
-x 6
+x 8
 y 30
 end
 arch woodfloor
-x 6
+x 8
 y 31
 end
 arch woodfloor
-x 6
-y 32
-end
-arch wall_2_1_2
-x 6
+x 8
 y 32
 end
 arch woodfloor
-x 7
-end
-arch wall_2_1_2
-x 7
+x 8
+y 33
 end
 arch woodfloor
-x 7
+x 8
+y 34
+end
+arch wall_2_1_2
+x 8
+y 34
+end
+arch cobblestones2
+x 8
+y 35
+end
+arch cobblestones2
+x 8
+y 36
+end
+arch cobblestones2
+x 9
+end
+arch cobblestones2
+x 9
 y 1
 end
+arch woodfloor
+x 9
+y 2
+end
+arch wall_2_1_2
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
 arch slotmachine3
 name Sally Silver
 food 0
-x 7
-y 1
+x 9
+y 3
 arch event_apply
 name event_apply
 title Python
@@ -1457,239 +1959,256 @@ slaying /python/casino/silverslots.py
 end
 end
 arch woodfloor
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 3
-end
-arch woodfloor
-x 7
+x 9
 y 4
 end
 arch woodfloor
-x 7
+x 9
 y 5
 end
 arch woodfloor
-x 7
+x 9
 y 6
 end
 arch woodfloor
-x 7
-y 7
-end
-arch cwall_0
-x 7
+x 9
 y 7
 end
 arch woodfloor
-x 7
+x 9
 y 8
 end
 arch woodfloor
-x 7
+x 9
+y 9
+end
+arch cwall_0
+x 9
 y 9
 end
 arch woodfloor
-x 7
+x 9
 y 10
 end
 arch woodfloor
-x 7
+x 9
 y 11
 end
 arch woodfloor
-x 7
+x 9
 y 12
 end
 arch woodfloor
-x 7
+x 9
 y 13
 end
 arch woodfloor
-x 7
-y 14
-end
-arch cwall_0
-x 7
+x 9
 y 14
 end
 arch woodfloor
-x 7
+x 9
 y 15
 end
 arch woodfloor
-x 7
+x 9
+y 16
+end
+arch cwall_0
+x 9
 y 16
 end
 arch woodfloor
-x 7
+x 9
 y 17
 end
 arch woodfloor
-x 7
+x 9
 y 18
 end
 arch woodfloor
-x 7
+x 9
 y 19
 end
 arch woodfloor
-x 7
-y 20
-end
-arch wall_1_4
-x 7
+x 9
 y 20
 end
 arch woodfloor
-x 7
+x 9
 y 21
 end
 arch woodfloor
-x 7
+x 9
+y 22
+end
+arch wall_1_4
+x 9
 y 22
 end
 arch woodfloor
-x 7
+x 9
 y 23
 end
 arch woodfloor
-x 7
+x 9
 y 24
 end
 arch woodfloor
-x 7
+x 9
 y 25
 end
 arch woodfloor
-x 7
+x 9
 y 26
 end
 arch woodfloor
-x 7
+x 9
 y 27
 end
 arch woodfloor
-x 7
+x 9
 y 28
 end
 arch woodfloor
-x 7
+x 9
 y 29
 end
 arch woodfloor
-x 7
+x 9
 y 30
 end
 arch woodfloor
-x 7
+x 9
 y 31
 end
 arch woodfloor
-x 7
-y 32
-end
-arch wall_2_1_2
-x 7
+x 9
 y 32
 end
 arch woodfloor
-x 8
-end
-arch wall_2_1_2
-x 8
+x 9
+y 33
 end
 arch woodfloor
-x 8
+x 9
+y 34
+end
+arch wall_2_1_2
+x 9
+y 34
+end
+arch cobblestones2
+x 9
+y 35
+end
+arch cobblestones2
+x 9
+y 36
+end
+arch cobblestones2
+x 10
+end
+arch cobblestones2
+x 10
 y 1
 end
 arch woodfloor
-x 8
+x 10
+y 2
+end
+arch wall_2_1_2
+x 10
 y 2
 end
 arch woodfloor
-x 8
+x 10
 y 3
 end
 arch woodfloor
-x 8
+x 10
 y 4
 end
 arch woodfloor
-x 8
+x 10
 y 5
 end
 arch woodfloor
-x 8
+x 10
 y 6
 end
 arch woodfloor
-x 8
+x 10
 y 7
 end
 arch woodfloor
-x 8
+x 10
 y 8
 end
 arch woodfloor
-x 8
+x 10
 y 9
 end
 arch woodfloor
-x 8
-y 10
-end
-arch chair_1.4
-x 8
+x 10
 y 10
 end
 arch woodfloor
-x 8
-y 11
-end
-arch chair_1.4
-x 8
+x 10
 y 11
 end
 arch woodfloor
-x 8
+x 10
+y 12
+end
+arch chair_1.4
+x 10
 y 12
 end
 arch woodfloor
-x 8
+x 10
+y 13
+end
+arch chair_1.4
+x 10
 y 13
 end
 arch woodfloor
-x 8
+x 10
 y 14
 end
 arch woodfloor
-x 8
-y 15
-end
-arch chair_1.4
-x 8
+x 10
 y 15
 end
 arch woodfloor
-x 8
+x 10
 y 16
 end
 arch woodfloor
-x 8
+x 10
+y 17
+end
+arch chair_1.4
+x 10
 y 17
 end
 arch woodfloor
-x 8
+x 10
 y 18
 end
+arch woodfloor
+x 10
+y 19
+end
+arch woodfloor
+x 10
+y 20
+end
 arch check_floor
 hp 1
-x 8
-y 19
+x 10
+y 21
 arch event_trigger
 name scorn/GatePassword 0-10>20
 title Python
@@ -1701,186 +2220,203 @@ msg
 You see some graffiti on the wall.
 It says : The Gate Password is "Chain"
 endmsg
-x 8
-y 19
+x 10
+y 21
 end
 arch woodfloor
-x 8
-y 19
+x 10
+y 21
 end
 arch woodfloor
-x 8
-y 20
+x 10
+y 22
 end
 arch wall_2_1_2
-x 8
-y 20
-end
-arch woodfloor
-x 8
-y 21
-end
-arch cwall_0
-x 8
-y 21
-end
-arch woodfloor
-x 8
+x 10
 y 22
 end
 arch woodfloor
-x 8
+x 10
+y 23
+end
+arch cwall_0
+x 10
 y 23
 end
 arch woodfloor
-x 8
+x 10
 y 24
 end
 arch woodfloor
-x 8
+x 10
 y 25
 end
 arch woodfloor
-x 8
-y 26
-end
-arch cwall_0
-x 8
+x 10
 y 26
 end
 arch woodfloor
-x 8
+x 10
 y 27
 end
 arch woodfloor
-x 8
+x 10
+y 28
+end
+arch cwall_0
+x 10
 y 28
 end
 arch woodfloor
-x 8
+x 10
 y 29
 end
 arch woodfloor
-x 8
+x 10
 y 30
 end
 arch woodfloor
-x 8
+x 10
 y 31
 end
+arch woodfloor
+x 10
+y 32
+end
+arch woodfloor
+x 10
+y 33
+end
 arch cwall_0
-x 8
-y 31
+x 10
+y 33
 end
 arch woodfloor
-x 8
-y 32
+x 10
+y 34
 end
 arch wall_2_1_2
-x 8
-y 32
+x 10
+y 34
+end
+arch cobblestones2
+x 10
+y 35
+end
+arch cobblestones2
+x 10
+y 36
+end
+arch cobblestones2
+x 11
+end
+arch cobblestones2
+x 11
+y 1
 end
 arch woodfloor
-x 9
+x 11
+y 2
 end
 arch wall_2_1_2
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch booze_table
-slaying money
-food 30
-x 9
-y 1
-invisible 1
-end
-arch woodfloor
-x 9
+x 11
 y 2
 end
-arch booze_table
-slaying money
-food 30
-x 9
-y 2
-invisible 1
-end
 arch woodfloor
-x 9
+x 11
 y 3
 end
 arch booze_table
 slaying money
 food 30
-x 9
+x 11
 y 3
 invisible 1
 end
 arch woodfloor
-x 9
+x 11
 y 4
 end
 arch booze_table
 slaying money
 food 30
-x 9
+x 11
 y 4
 invisible 1
 end
 arch woodfloor
-x 9
+x 11
 y 5
 end
+arch booze_table
+slaying money
+food 30
+x 11
+y 5
+invisible 1
+end
 arch woodfloor
-x 9
+x 11
 y 6
 end
-arch woodfloor
-x 9
-y 7
+arch booze_table
+slaying money
+food 30
+x 11
+y 6
+invisible 1
 end
-arch chair_1.4
-x 9
+arch woodfloor
+x 11
 y 7
 end
 arch woodfloor
-x 9
+x 11
 y 8
 end
 arch woodfloor
-x 9
+x 11
 y 9
 end
+arch chair_1.4
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
 arch chair_1.1
-x 9
-y 9
-end
-arch woodfloor
-x 9
-y 10
-end
-arch table_3
-x 9
-y 10
-end
-arch woodfloor
-x 9
-y 11
-end
-arch table_3
-x 9
+x 11
 y 11
 end
 arch woodfloor
-x 9
+x 11
 y 12
 end
+arch table_3
+x 11
+y 12
+end
+arch woodfloor
+x 11
+y 13
+end
+arch table_3
+x 11
+y 13
+end
+arch woodfloor
+x 11
+y 14
+end
 arch chair_1.3
-x 9
-y 12
+x 11
+y 14
 end
 arch dwarf
 name Lumberjack
@@ -1894,245 +2430,262 @@ I chop them down in the great forest to the east.  I wandered across a great tow
 @match tower|great
 The tower of Sokoban.  Apparently he was a puzzle creator.  For those that can solve the puzzles, there is rumored to be a nice treasure.
 endmsg
-x 9
-y 12
+x 11
+y 14
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 9
-y 13
-end
-arch woodfloor
-x 9
-y 14
-end
-arch woodfloor
-x 9
+x 11
 y 15
 end
+arch woodfloor
+x 11
+y 16
+end
+arch woodfloor
+x 11
+y 17
+end
 arch table_3
-x 9
-y 15
-end
-arch woodfloor
-x 9
-y 16
-end
-arch chair_1.3
-x 9
-y 16
-end
-arch woodfloor
-x 9
+x 11
 y 17
 end
 arch woodfloor
-x 9
+x 11
+y 18
+end
+arch chair_1.3
+x 11
 y 18
 end
 arch woodfloor
-x 9
+x 11
 y 19
 end
 arch woodfloor
-x 9
+x 11
 y 20
 end
+arch woodfloor
+x 11
+y 21
+end
+arch woodfloor
+x 11
+y 22
+end
 arch wall_3_3
-x 9
-y 20
-end
-arch woodfloor
-x 9
-y 21
-end
-arch wall_2_1_1
-x 9
-y 21
-end
-arch woodfloor
-x 9
-y 22
-end
-arch wall_2_1_1
-x 9
+x 11
 y 22
 end
 arch woodfloor
-x 9
+x 11
 y 23
 end
 arch wall_2_1_1
-x 9
+x 11
 y 23
 end
 arch woodfloor
-x 9
+x 11
 y 24
 end
 arch wall_2_1_1
-x 9
+x 11
 y 24
 end
 arch woodfloor
-x 9
+x 11
 y 25
 end
 arch wall_2_1_1
-x 9
+x 11
 y 25
 end
 arch woodfloor
-x 9
+x 11
 y 26
 end
 arch wall_2_1_1
-x 9
+x 11
 y 26
 end
 arch woodfloor
-x 9
+x 11
 y 27
 end
 arch wall_2_1_1
-x 9
+x 11
 y 27
 end
 arch woodfloor
-x 9
+x 11
 y 28
 end
+arch wall_2_1_1
+x 11
+y 28
+end
+arch woodfloor
+x 11
+y 29
+end
+arch wall_2_1_1
+x 11
+y 29
+end
+arch woodfloor
+x 11
+y 30
+end
 arch wall_1_2
-x 9
-y 28
+x 11
+y 30
 end
 arch magic_mouth
 msg
 Cloak Room
 endmsg
-x 9
-y 29
+x 11
+y 31
 end
 arch woodfloor
-x 9
-y 29
+x 11
+y 31
 end
 arch woodfloor
-x 9
-y 30
+x 11
+y 32
 end
 arch wall_1_1
-x 9
-y 30
+x 11
+y 32
 end
 arch woodfloor
-x 9
-y 31
+x 11
+y 33
 end
 arch wall_2_1_1
-x 9
-y 31
+x 11
+y 33
 end
 arch woodfloor
-x 9
-y 32
+x 11
+y 34
 end
 arch wall_3_1
-x 9
-y 32
+x 11
+y 34
+end
+arch cobblestones2
+x 11
+y 35
+end
+arch cobblestones2
+x 11
+y 36
+end
+arch cobblestones2
+x 12
+end
+arch cobblestones2
+x 12
+y 1
 end
 arch woodfloor
-x 10
+x 12
+y 2
 end
 arch wall_2_1_2
-x 10
+x 12
+y 2
 end
 arch dungeon_magic
-x 10
-y 1
+x 12
+y 3
 end
 arch woodfloor
-x 10
-y 1
+x 12
+y 3
 end
 arch bench_1_1
-x 10
-y 1
+x 12
+y 3
 move_block all
 end
 arch dungeon_magic
-x 10
-y 2
+x 12
+y 4
 end
 arch woodfloor
-x 10
-y 2
+x 12
+y 4
 end
 arch bench_2_1_1
-x 10
-y 2
+x 12
+y 4
 move_block all
 end
 arch dungeon_magic
-x 10
-y 3
+x 12
+y 5
 end
 arch woodfloor
-x 10
-y 3
+x 12
+y 5
 end
 arch bench_2_2_1
-x 10
-y 3
+x 12
+y 5
 move_block all
 end
 arch woodfloor
-x 10
-y 4
+x 12
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 10
-y 4
+x 12
+y 6
 invisible 1
 end
 arch woodfloor
-x 10
-y 5
+x 12
+y 7
 end
 arch woodfloor
-x 10
-y 6
+x 12
+y 8
 end
 arch chair_1.1
-x 10
-y 6
+x 12
+y 8
 end
 arch magic_ear
-x 10
-y 7
+x 12
+y 9
 end
 arch woodfloor
-x 10
-y 7
+x 12
+y 9
 end
 arch table_3
-x 10
-y 7
+x 12
+y 9
 end
 arch magic_ear
-x 10
-y 8
+x 12
+y 10
 end
 arch woodfloor
-x 10
-y 8
+x 12
+y 10
 end
 arch chair_1.3
-x 10
-y 8
+x 12
+y 10
 end
 arch priest
 name Drachnak the Priest
@@ -2155,8 +2708,8 @@ exp 300
 dam 10
 wc 15
 ac 3
-x 10
-y 8
+x 12
+y 10
 level 5
 type 0
 resist_magic 100
@@ -2166,41 +2719,41 @@ friendly 1
 can_cast_spell 1
 end
 arch woodfloor
-x 10
-y 9
-end
-arch woodfloor
-x 10
-y 10
-end
-arch woodfloor
-x 10
+x 12
 y 11
 end
 arch woodfloor
-x 10
+x 12
 y 12
 end
 arch woodfloor
-x 10
+x 12
 y 13
 end
 arch woodfloor
-x 10
+x 12
 y 14
 end
 arch woodfloor
-x 10
-y 15
-end
-arch chair_1.2
-x 10
+x 12
 y 15
 end
 arch woodfloor
-x 10
+x 12
 y 16
 end
+arch woodfloor
+x 12
+y 17
+end
+arch chair_1.2
+x 12
+y 17
+end
+arch woodfloor
+x 12
+y 18
+end
 arch courier
 name Joey the scribe
 msg
@@ -2222,153 +2775,170 @@ Take my wight... please.
 @match *
 Want to hear a joke?
 endmsg
-x 10
-y 16
+x 12
+y 18
 monster 0
 friendly 1
 stand_still 1
 end
 arch woodfloor
-x 10
-y 17
-end
-arch woodfloor
-x 10
-y 18
-end
-arch woodfloor
-x 10
+x 12
 y 19
 end
 arch woodfloor
-x 10
+x 12
 y 20
 end
+arch woodfloor
+x 12
+y 21
+end
+arch woodfloor
+x 12
+y 22
+end
 arch wall_2_1_2
-x 10
-y 20
-end
-arch woodfloor
-x 10
-y 21
-end
-arch bookshelf_left_close
-x 10
-y 21
-end
-arch woodfloor
-x 10
+x 12
 y 22
 end
 arch woodfloor
-x 10
+x 12
 y 23
 end
 arch bookshelf_left_close
-x 10
+x 12
 y 23
 end
 arch woodfloor
-x 10
+x 12
 y 24
 end
 arch woodfloor
-x 10
+x 12
 y 25
 end
 arch bookshelf_left_close
-x 10
+x 12
 y 25
 end
 arch woodfloor
-x 10
+x 12
 y 26
 end
 arch woodfloor
-x 10
+x 12
 y 27
 end
 arch bookshelf_left_close
-x 10
+x 12
 y 27
 end
 arch woodfloor
-x 10
+x 12
 y 28
 end
 arch woodfloor
-x 10
+x 12
+y 29
+end
+arch bookshelf_left_close
+x 12
 y 29
 end
 arch woodfloor
-x 10
+x 12
 y 30
 end
 arch woodfloor
-x 10
+x 12
 y 31
 end
+arch woodfloor
+x 12
+y 32
+end
+arch woodfloor
+x 12
+y 33
+end
 arch bookshelf_left_close
-x 10
-y 31
+x 12
+y 33
 end
 arch woodfloor
-x 10
-y 32
+x 12
+y 34
 end
 arch wall_2_1_2
-x 10
-y 32
+x 12
+y 34
 end
-arch woodfloor
-x 11
+arch cobblestones2
+x 12
+y 35
 end
-arch wall_2_1_2
-x 11
+arch cobblestones2
+x 12
+y 36
 end
-arch woodfloor
-x 11
-y 1
+arch cobblestones2
+x 13
 end
-arch longtable_1_4
-x 11
-y 1
-end
-arch booze
-x 11
+arch cobblestones2
+x 13
 y 1
 end
 arch woodfloor
-x 11
+x 13
 y 2
 end
-arch dungeon_magic
-x 11
+arch wall_2_1_2
+x 13
+y 2
+end
+arch woodfloor
+x 13
+y 3
+end
+arch longtable_1_4
+x 13
+y 3
+end
+arch booze
+x 13
 y 3
 end
 arch woodfloor
-x 11
-y 3
+x 13
+y 4
+end
+arch dungeon_magic
+x 13
+y 5
+end
+arch woodfloor
+x 13
+y 5
 end
 arch bench_2_1_2
-x 11
-y 3
+x 13
+y 5
 move_block all
 end
 arch woodfloor
-x 11
-y 4
+x 13
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 11
-y 4
+x 13
+y 6
 invisible 1
 end
 arch chair_1.1
-x 11
-y 4
+x 13
+y 6
 end
 arch elf_1
 name Silinar
@@ -2382,628 +2952,679 @@ Do you want to know where it is located?
 It is in the mountain range south of Darcap.  The mountains flatten out some to reveal a small lake.
 endmsg
 hp 300
-x 11
-y 4
+x 13
+y 6
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 11
-y 5
-end
-arch woodfloor
-x 11
-y 6
-end
-arch woodfloor
-x 11
-y 7
-end
-arch chair_1.2
-x 11
+x 13
 y 7
 end
 arch woodfloor
-x 11
+x 13
 y 8
 end
 arch woodfloor
-x 11
+x 13
+y 9
+end
+arch chair_1.2
+x 13
 y 9
 end
 arch woodfloor
-x 11
+x 13
 y 10
 end
 arch woodfloor
-x 11
+x 13
 y 11
 end
 arch woodfloor
-x 11
+x 13
 y 12
 end
 arch woodfloor
-x 11
+x 13
 y 13
 end
 arch woodfloor
-x 11
+x 13
 y 14
 end
 arch woodfloor
-x 11
+x 13
 y 15
 end
 arch woodfloor
-x 11
+x 13
 y 16
 end
 arch woodfloor
-x 11
+x 13
 y 17
 end
 arch woodfloor
-x 11
+x 13
 y 18
 end
 arch woodfloor
-x 11
+x 13
 y 19
 end
 arch woodfloor
-x 11
-y 20
-end
-arch wall_2_1_2
-x 11
+x 13
 y 20
 end
 arch woodfloor
-x 11
+x 13
 y 21
 end
 arch woodfloor
-x 11
+x 13
+y 22
+end
+arch wall_2_1_2
+x 13
 y 22
 end
 arch woodfloor
-x 11
+x 13
 y 23
 end
 arch woodfloor
-x 11
+x 13
 y 24
 end
 arch woodfloor
-x 11
+x 13
 y 25
 end
 arch woodfloor
-x 11
+x 13
 y 26
 end
 arch woodfloor
-x 11
+x 13
 y 27
 end
 arch woodfloor
-x 11
+x 13
 y 28
 end
 arch woodfloor
-x 11
+x 13
 y 29
 end
 arch woodfloor
-x 11
+x 13
 y 30
 end
 arch woodfloor
-x 11
+x 13
 y 31
 end
 arch woodfloor
-x 11
-y 32
-end
-arch wall_2_1_2
-x 11
+x 13
 y 32
 end
 arch woodfloor
-x 12
+x 13
+y 33
+end
+arch woodfloor
+x 13
+y 34
 end
 arch wall_2_1_2
-x 12
+x 13
+y 34
 end
-arch woodfloor
-x 12
-y 1
+arch cobblestones2
+x 13
+y 35
 end
-arch longtable_2_1_2
-x 12
-y 1
+arch cobblestones2
+x 13
+y 36
 end
-arch booze
-x 12
+arch cobblestones2
+x 14
+end
+arch cobblestones2
+x 14
 y 1
 end
 arch woodfloor
-x 12
+x 14
 y 2
 end
-arch dungeon_magic
-x 12
+arch wall_2_1_2
+x 14
+y 2
+end
+arch woodfloor
+x 14
+y 3
+end
+arch longtable_2_1_2
+x 14
+y 3
+end
+arch booze
+x 14
 y 3
 end
 arch woodfloor
-x 12
-y 3
+x 14
+y 4
+end
+arch dungeon_magic
+x 14
+y 5
+end
+arch woodfloor
+x 14
+y 5
 end
 arch bench_2_1_2
-x 12
-y 3
+x 14
+y 5
 move_block all
 end
 arch woodfloor
-x 12
-y 4
+x 14
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 12
-y 4
+x 14
+y 6
 invisible 1
 end
 arch chair_1.3
-x 12
-y 4
-end
-arch woodfloor
-x 12
-y 5
-end
-arch woodfloor
-x 12
+x 14
 y 6
 end
 arch woodfloor
-x 12
+x 14
 y 7
 end
 arch woodfloor
-x 12
+x 14
 y 8
 end
 arch woodfloor
-x 12
+x 14
 y 9
 end
 arch woodfloor
-x 12
+x 14
 y 10
 end
 arch woodfloor
-x 12
+x 14
 y 11
 end
 arch woodfloor
-x 12
+x 14
 y 12
 end
 arch woodfloor
-x 12
+x 14
 y 13
 end
 arch woodfloor
-x 12
+x 14
 y 14
 end
 arch woodfloor
-x 12
+x 14
 y 15
 end
 arch woodfloor
-x 12
+x 14
 y 16
 end
 arch woodfloor
-x 12
+x 14
 y 17
 end
 arch woodfloor
-x 12
+x 14
 y 18
 end
 arch woodfloor
-x 12
+x 14
 y 19
 end
 arch woodfloor
-x 12
+x 14
 y 20
 end
+arch woodfloor
+x 14
+y 21
+end
+arch woodfloor
+x 14
+y 22
+end
 arch wall_2_1_2
-x 12
-y 20
-end
-arch woodfloor
-x 12
-y 21
-end
-arch close_dresser2
-x 12
-y 21
-end
-arch woodfloor
-x 12
+x 14
 y 22
 end
 arch woodfloor
-x 12
+x 14
 y 23
 end
 arch close_dresser2
-x 12
+x 14
 y 23
 end
 arch woodfloor
-x 12
+x 14
 y 24
 end
 arch woodfloor
-x 12
+x 14
 y 25
 end
 arch close_dresser2
-x 12
+x 14
 y 25
 end
 arch woodfloor
-x 12
+x 14
 y 26
 end
 arch woodfloor
-x 12
+x 14
 y 27
 end
 arch close_dresser2
-x 12
+x 14
 y 27
 end
 arch woodfloor
-x 12
+x 14
 y 28
 end
 arch woodfloor
-x 12
+x 14
 y 29
 end
 arch close_dresser2
-x 12
+x 14
 y 29
 end
 arch woodfloor
-x 12
+x 14
 y 30
 end
 arch woodfloor
-x 12
+x 14
 y 31
 end
 arch close_dresser2
-x 12
+x 14
 y 31
 end
 arch woodfloor
-x 12
-y 32
-end
-arch wall_2_1_2
-x 12
+x 14
 y 32
 end
 arch woodfloor
-x 13
+x 14
+y 33
+end
+arch close_dresser2
+x 14
+y 33
+end
+arch woodfloor
+x 14
+y 34
 end
 arch wall_2_1_2
-x 13
+x 14
+y 34
 end
-arch woodfloor
-x 13
-y 1
+arch cobblestones2
+x 14
+y 35
 end
-arch longtable_2_1_2
-x 13
-y 1
+arch cobblestones2
+x 14
+y 36
 end
-arch booze
-x 13
+arch cobblestones2
+x 15
+end
+arch cobblestones2
+x 15
 y 1
 end
 arch woodfloor
-x 13
+x 15
 y 2
 end
-arch dungeon_magic
-x 13
+arch wall_2_1_2
+x 15
+y 2
+end
+arch woodfloor
+x 15
+y 3
+end
+arch longtable_2_1_2
+x 15
+y 3
+end
+arch booze
+x 15
 y 3
 end
 arch woodfloor
-x 13
-y 3
+x 15
+y 4
+end
+arch dungeon_magic
+x 15
+y 5
+end
+arch woodfloor
+x 15
+y 5
 end
 arch bench_2_1_2
-x 13
-y 3
+x 15
+y 5
 move_block all
 end
 arch woodfloor
-x 13
-y 4
+x 15
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 13
-y 4
+x 15
+y 6
 invisible 1
 end
 arch woodfloor
-x 13
-y 5
-end
-arch woodfloor
-x 13
-y 6
-end
-arch woodfloor
-x 13
+x 15
 y 7
 end
 arch woodfloor
-x 13
+x 15
 y 8
 end
 arch woodfloor
-x 13
+x 15
 y 9
 end
 arch woodfloor
-x 13
+x 15
 y 10
 end
 arch woodfloor
-x 13
+x 15
 y 11
 end
+arch woodfloor
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
 arch table_3
-x 13
-y 11
-end
-arch woodfloor
-x 13
-y 12
-end
-arch chair_1.3
-x 13
-y 12
-end
-arch woodfloor
-x 13
+x 15
 y 13
 end
 arch woodfloor
-x 13
+x 15
+y 14
+end
+arch chair_1.3
+x 15
 y 14
 end
 arch woodfloor
-x 13
+x 15
 y 15
 end
 arch woodfloor
-x 13
+x 15
 y 16
 end
 arch woodfloor
-x 13
+x 15
 y 17
 end
 arch woodfloor
-x 13
+x 15
 y 18
 end
 arch woodfloor
-x 13
+x 15
 y 19
 end
 arch woodfloor
-x 13
+x 15
 y 20
 end
+arch woodfloor
+x 15
+y 21
+end
+arch woodfloor
+x 15
+y 22
+end
 arch wall_3_3
-x 13
-y 20
-end
-arch woodfloor
-x 13
-y 21
-end
-arch wall_2_1_1
-x 13
-y 21
-end
-arch woodfloor
-x 13
-y 22
-end
-arch wall_2_1_1
-x 13
+x 15
 y 22
 end
 arch woodfloor
-x 13
+x 15
 y 23
 end
 arch wall_2_1_1
-x 13
+x 15
 y 23
 end
 arch woodfloor
-x 13
+x 15
 y 24
 end
 arch wall_2_1_1
-x 13
+x 15
 y 24
 end
 arch woodfloor
-x 13
+x 15
 y 25
 end
 arch wall_2_1_1
-x 13
+x 15
 y 25
 end
 arch woodfloor
-x 13
+x 15
 y 26
 end
 arch wall_2_1_1
-x 13
+x 15
 y 26
 end
 arch woodfloor
-x 13
+x 15
 y 27
 end
 arch wall_2_1_1
-x 13
+x 15
 y 27
 end
 arch woodfloor
-x 13
+x 15
 y 28
 end
 arch wall_2_1_1
-x 13
+x 15
 y 28
 end
 arch woodfloor
-x 13
+x 15
 y 29
 end
 arch wall_2_1_1
-x 13
+x 15
 y 29
 end
 arch woodfloor
-x 13
+x 15
 y 30
 end
 arch wall_2_1_1
-x 13
+x 15
 y 30
 end
 arch woodfloor
-x 13
+x 15
 y 31
 end
 arch wall_2_1_1
-x 13
+x 15
 y 31
 end
 arch woodfloor
-x 13
+x 15
 y 32
 end
+arch wall_2_1_1
+x 15
+y 32
+end
+arch woodfloor
+x 15
+y 33
+end
+arch wall_2_1_1
+x 15
+y 33
+end
+arch woodfloor
+x 15
+y 34
+end
 arch wall_3_1
-x 13
-y 32
+x 15
+y 34
 end
-arch woodfloor
-x 14
+arch cobblestones2
+x 15
+y 35
 end
-arch wall_2_1_2
-x 14
+arch cobblestones2
+x 15
+y 36
 end
-arch woodfloor
-x 14
-y 1
+arch cobblestones2
+x 16
 end
-arch longtable_2_1_2
-x 14
-y 1
-end
-arch booze
-x 14
+arch cobblestones2
+x 16
 y 1
 end
 arch woodfloor
-x 14
+x 16
 y 2
 end
-arch dungeon_magic
-x 14
+arch wall_2_1_2
+x 16
+y 2
+end
+arch woodfloor
+x 16
+y 3
+end
+arch longtable_2_1_2
+x 16
+y 3
+end
+arch booze
+x 16
 y 3
 end
 arch woodfloor
-x 14
-y 3
+x 16
+y 4
+end
+arch dungeon_magic
+x 16
+y 5
+end
+arch woodfloor
+x 16
+y 5
 end
 arch bench_2_1_2
-x 14
-y 3
+x 16
+y 5
 move_block all
 end
 arch woodfloor
-x 14
-y 4
+x 16
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 14
-y 4
+x 16
+y 6
 invisible 1
 end
 arch woodfloor
-x 14
-y 5
-end
-arch woodfloor
-x 14
-y 6
-end
-arch woodfloor
-x 14
-y 7
-end
-arch cwall_0
-x 14
+x 16
 y 7
 end
 arch woodfloor
-x 14
+x 16
 y 8
 end
 arch woodfloor
-x 14
+x 16
+y 9
+end
+arch cwall_0
+x 16
 y 9
 end
 arch woodfloor
-x 14
+x 16
 y 10
 end
 arch woodfloor
-x 14
+x 16
 y 11
 end
+arch woodfloor
+x 16
+y 12
+end
+arch woodfloor
+x 16
+y 13
+end
 arch chair_1.2
-x 14
-y 11
+x 16
+y 13
 end
 arch warrior_1
 name 1st Tier warrior
@@ -3022,280 +3643,297 @@ That should do for a start.
 If you desire a harder challenge, try the wizards over there.  They might have information.
 I wouldn't talk to the one in the corner unless you're 15th Tier or better in your guilds.  He'll get you killed taking on things that could snuff you out with a sneeze!!!  HAr har har!!!
 endmsg
-x 14
-y 11
+x 16
+y 13
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 14
-y 12
-end
-arch woodfloor
-x 14
-y 13
-end
-arch woodfloor
-x 14
-y 14
-end
-arch cwall_0
-x 14
+x 16
 y 14
 end
 arch woodfloor
-x 14
+x 16
 y 15
 end
 arch woodfloor
-x 14
+x 16
 y 16
 end
-arch table_3
-x 14
+arch cwall_0
+x 16
 y 16
 end
 arch woodfloor
-x 14
-y 17
-end
-arch table_3
-x 14
+x 16
 y 17
 end
 arch woodfloor
-x 14
+x 16
 y 18
 end
 arch table_3
-x 14
+x 16
 y 18
 end
 arch woodfloor
-x 14
+x 16
+y 19
+end
+arch table_3
+x 16
 y 19
 end
 arch woodfloor
-x 14
+x 16
 y 20
 end
-arch wall_2_1_2
-x 14
+arch table_3
+x 16
 y 20
 end
 arch woodfloor
-x 14
+x 16
 y 21
 end
 arch woodfloor
-x 14
+x 16
+y 22
+end
+arch wall_2_1_2
+x 16
 y 22
 end
 arch woodfloor
-x 14
+x 16
 y 23
 end
-arch chair_1.1
-x 14
-y 23
-end
-arch woman
-x 14
-y 23
-friendly 1
-end
 arch woodfloor
-x 14
+x 16
 y 24
 end
-arch woman
-x 14
-y 24
-friendly 1
-end
 arch woodfloor
-x 14
+x 16
 y 25
 end
 arch chair_1.1
-x 14
+x 16
 y 25
 end
 arch woman
-x 14
+x 16
 y 25
 friendly 1
 end
 arch woodfloor
-x 14
-y 26
-end
-arch chair_1.1
-x 14
+x 16
 y 26
 end
 arch woman
-x 14
+x 16
 y 26
 friendly 1
 end
 arch woodfloor
-x 14
+x 16
 y 27
 end
+arch chair_1.1
+x 16
+y 27
+end
+arch woman
+x 16
+y 27
+friendly 1
+end
 arch woodfloor
-x 14
+x 16
 y 28
 end
-arch woodfloor
-x 14
-y 29
-end
 arch chair_1.1
-x 14
+x 16
+y 28
+end
+arch woman
+x 16
+y 28
+friendly 1
+end
+arch woodfloor
+x 16
 y 29
 end
 arch woodfloor
-x 14
+x 16
 y 30
 end
 arch woodfloor
-x 14
+x 16
+y 31
+end
+arch chair_1.1
+x 16
 y 31
 end
 arch woodfloor
-x 14
-y 32
-end
-arch wall_2_1_2
-x 14
+x 16
 y 32
 end
 arch woodfloor
-x 15
+x 16
+y 33
+end
+arch woodfloor
+x 16
+y 34
 end
 arch wall_2_1_2
-x 15
+x 16
+y 34
 end
-arch woodfloor
-x 15
-y 1
+arch cobblestones2
+x 16
+y 35
 end
-arch longtable_2_1_2
-x 15
-y 1
+arch cobblestones2
+x 16
+y 36
 end
-arch booze
-x 15
+arch cobblestones2
+x 17
+end
+arch cobblestones2
+x 17
 y 1
 end
 arch woodfloor
-x 15
+x 17
 y 2
 end
-arch dungeon_magic
-x 15
+arch wall_2_1_2
+x 17
+y 2
+end
+arch woodfloor
+x 17
+y 3
+end
+arch longtable_2_1_2
+x 17
+y 3
+end
+arch booze
+x 17
 y 3
 end
 arch woodfloor
-x 15
-y 3
+x 17
+y 4
+end
+arch dungeon_magic
+x 17
+y 5
+end
+arch woodfloor
+x 17
+y 5
 end
 arch bench_2_1_2
-x 15
-y 3
+x 17
+y 5
 move_block all
 end
 arch woodfloor
-x 15
-y 4
+x 17
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 15
-y 4
+x 17
+y 6
 invisible 1
 end
 arch chair_1.3
-x 15
-y 4
-end
-arch woodfloor
-x 15
-y 5
-end
-arch woodfloor
-x 15
+x 17
 y 6
 end
 arch woodfloor
-x 15
+x 17
 y 7
 end
 arch woodfloor
-x 15
+x 17
 y 8
 end
 arch woodfloor
-x 15
+x 17
 y 9
 end
 arch woodfloor
-x 15
+x 17
 y 10
 end
 arch woodfloor
-x 15
+x 17
 y 11
 end
 arch woodfloor
-x 15
+x 17
 y 12
 end
 arch woodfloor
-x 15
+x 17
 y 13
 end
 arch woodfloor
-x 15
+x 17
 y 14
 end
 arch woodfloor
-x 15
+x 17
 y 15
 end
 arch woodfloor
-x 15
-y 16
-end
-arch chair_1.2
-x 15
+x 17
 y 16
 end
 arch woodfloor
-x 15
-y 17
-end
-arch chair_1.2
-x 15
+x 17
 y 17
 end
 arch woodfloor
-x 15
+x 17
 y 18
 end
 arch chair_1.2
-x 15
+x 17
 y 18
 end
+arch woodfloor
+x 17
+y 19
+end
+arch chair_1.2
+x 17
+y 19
+end
+arch woodfloor
+x 17
+y 20
+end
+arch chair_1.2
+x 17
+y 20
+end
 arch a_townsman
 name Hintson
 race Serpentman
 face serpentman.152
 exp 30000
-x 15
-y 18
+x 17
+y 20
 level 4
 friendly 1
 arch event_say
@@ -3305,345 +3943,379 @@ slaying /python/dialog/npc_dialog.py
 end
 end
 arch woodfloor
-x 15
-y 19
-end
-arch woodfloor
-x 15
-y 20
-end
-arch wall_2_1_2
-x 15
-y 20
-end
-arch woodfloor
-x 15
+x 17
 y 21
 end
 arch woodfloor
-x 15
+x 17
+y 22
+end
+arch wall_2_1_2
+x 17
 y 22
 end
 arch woodfloor
-x 15
-y 23
-end
-arch table_2
-x 15
+x 17
 y 23
 end
 arch woodfloor
-x 15
-y 24
-end
-arch table_2
-x 15
+x 17
 y 24
 end
 arch woodfloor
-x 15
+x 17
 y 25
 end
 arch table_2
-x 15
+x 17
 y 25
 end
 arch woodfloor
-x 15
+x 17
 y 26
 end
 arch table_2
-x 15
+x 17
 y 26
 end
 arch woodfloor
-x 15
+x 17
 y 27
 end
 arch table_2
-x 15
+x 17
 y 27
 end
 arch woodfloor
-x 15
+x 17
 y 28
 end
 arch table_2
-x 15
+x 17
 y 28
 end
 arch woodfloor
-x 15
+x 17
 y 29
 end
 arch table_2
-x 15
+x 17
 y 29
 end
 arch woodfloor
-x 15
+x 17
+y 30
+end
+arch table_2
+x 17
 y 30
 end
 arch woodfloor
-x 15
+x 17
+y 31
+end
+arch table_2
+x 17
 y 31
 end
 arch woodfloor
-x 15
-y 32
-end
-arch wall_2_1_2
-x 15
+x 17
 y 32
 end
 arch woodfloor
-x 16
+x 17
+y 33
+end
+arch woodfloor
+x 17
+y 34
 end
 arch wall_2_1_2
-x 16
+x 17
+y 34
 end
-arch woodfloor
-x 16
-y 1
+arch cobblestones2
+x 17
+y 35
 end
-arch longtable_2_1_2
-x 16
-y 1
+arch cobblestones2
+x 17
+y 36
 end
-arch booze
-x 16
+arch cobblestones2
+x 18
+end
+arch cobblestones2
+x 18
 y 1
 end
 arch woodfloor
-x 16
+x 18
 y 2
 end
-arch dungeon_magic
-x 16
+arch wall_2_1_2
+x 18
+y 2
+end
+arch woodfloor
+x 18
+y 3
+end
+arch longtable_2_1_2
+x 18
+y 3
+end
+arch booze
+x 18
 y 3
 end
 arch woodfloor
-x 16
-y 3
+x 18
+y 4
+end
+arch dungeon_magic
+x 18
+y 5
+end
+arch woodfloor
+x 18
+y 5
 end
 arch bench_2_1_2
-x 16
-y 3
+x 18
+y 5
 move_block all
 end
 arch woodfloor
-x 16
-y 4
+x 18
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 16
-y 4
+x 18
+y 6
 invisible 1
 end
 arch chair_1.3
-x 16
-y 4
-end
-arch woodfloor
-x 16
-y 5
-end
-arch woodfloor
-x 16
+x 18
 y 6
 end
 arch woodfloor
-x 16
-y 7
-end
-arch chair_1.4
-x 16
+x 18
 y 7
 end
 arch woodfloor
-x 16
+x 18
 y 8
 end
 arch woodfloor
-x 16
+x 18
+y 9
+end
+arch chair_1.4
+x 18
 y 9
 end
 arch woodfloor
-x 16
+x 18
 y 10
 end
 arch woodfloor
-x 16
+x 18
 y 11
 end
 arch woodfloor
-x 16
-y 12
-end
-arch chair_1.4
-x 16
+x 18
 y 12
 end
 arch woodfloor
-x 16
+x 18
 y 13
 end
 arch woodfloor
-x 16
+x 18
+y 14
+end
+arch chair_1.4
+x 18
 y 14
 end
 arch woodfloor
-x 16
+x 18
 y 15
 end
 arch woodfloor
-x 16
+x 18
 y 16
 end
 arch woodfloor
-x 16
+x 18
 y 17
 end
 arch woodfloor
-x 16
+x 18
 y 18
 end
 arch woodfloor
-x 16
+x 18
 y 19
 end
 arch woodfloor
-x 16
-y 20
-end
-arch wall_2_1_2
-x 16
+x 18
 y 20
 end
 arch woodfloor
-x 16
+x 18
 y 21
 end
 arch woodfloor
-x 16
+x 18
+y 22
+end
+arch wall_2_1_2
+x 18
 y 22
 end
 arch woodfloor
-x 16
+x 18
 y 23
 end
-arch chair_1.2
-x 16
-y 23
-end
-arch man
-x 16
-y 23
-friendly 1
-end
 arch woodfloor
-x 16
+x 18
 y 24
 end
-arch chair_1.2
-x 16
-y 24
-end
-arch man
-x 16
-y 24
-friendly 1
-end
 arch woodfloor
-x 16
+x 18
 y 25
 end
 arch chair_1.2
-x 16
+x 18
 y 25
 end
 arch man
-x 16
+x 18
 y 25
 friendly 1
 end
 arch woodfloor
-x 16
+x 18
 y 26
 end
 arch chair_1.2
-x 16
+x 18
 y 26
 end
 arch man
-x 16
+x 18
 y 26
 friendly 1
 end
 arch woodfloor
-x 16
+x 18
 y 27
 end
 arch chair_1.2
-x 16
+x 18
 y 27
 end
 arch man
-x 16
+x 18
 y 27
 friendly 1
 end
 arch woodfloor
-x 16
+x 18
 y 28
 end
+arch chair_1.2
+x 18
+y 28
+end
+arch man
+x 18
+y 28
+friendly 1
+end
 arch woodfloor
-x 16
+x 18
 y 29
 end
 arch chair_1.2
-x 16
+x 18
 y 29
 end
+arch man
+x 18
+y 29
+friendly 1
+end
 arch woodfloor
-x 16
+x 18
 y 30
 end
 arch woodfloor
-x 16
+x 18
+y 31
+end
+arch chair_1.2
+x 18
 y 31
 end
 arch woodfloor
-x 16
-y 32
-end
-arch wall_2_1_2
-x 16
+x 18
 y 32
 end
 arch woodfloor
-x 17
-end
-arch wall_2_1_2
-x 17
+x 18
+y 33
 end
 arch woodfloor
-x 17
+x 18
+y 34
+end
+arch wall_2_1_2
+x 18
+y 34
+end
+arch cobblestones2
+x 18
+y 35
+end
+arch cobblestones2
+x 18
+y 36
+end
+arch cobblestones2
+x 19
+end
+arch cobblestones2
+x 19
 y 1
 end
+arch woodfloor
+x 19
+y 2
+end
+arch wall_2_1_2
+x 19
+y 2
+end
+arch woodfloor
+x 19
+y 3
+end
 arch longtable_2_1_2
-x 17
-y 1
+x 19
+y 3
 end
 arch booze
-x 17
-y 1
+x 19
+y 3
 end
 arch woodfloor
-x 17
-y 2
+x 19
+y 4
 end
 arch warrior_1
 name Bar Tender
@@ -3652,262 +4324,279 @@ msg
 If you want something to drink, it will be 3 gp.
 endmsg
 face warrior.151
-x 17
-y 2
+x 19
+y 4
 speed 0.400000
 friendly 1
 unaggressive 0
 end
 arch dungeon_magic
-x 17
-y 3
-end
-arch woodfloor
-x 17
-y 3
-end
-arch bench_2_1_2
-x 17
-y 3
-move_block all
-end
-arch woodfloor
-x 17
-y 4
-end
-arch booze_table
-slaying money
-food 30
-x 17
-y 4
-invisible 1
-end
-arch woodfloor
-x 17
+x 19
 y 5
 end
 arch woodfloor
-x 17
-y 6
-end
-arch chair_1.1
-x 17
-y 6
-end
-arch woodfloor
-x 17
-y 7
-end
-arch table_3
-x 17
-y 7
-end
-arch woodfloor
-x 17
-y 8
-end
-arch woodfloor
-x 17
-y 9
-end
-arch woodfloor
-x 17
-y 10
-end
-arch woodfloor
-x 17
-y 11
-end
-arch woodfloor
-x 17
-y 12
-end
-arch table_3
-x 17
-y 12
-end
-arch woodfloor
-x 17
-y 13
-end
-arch chair_1.3
-x 17
-y 13
-end
-arch woodfloor
-x 17
-y 14
-end
-arch woodfloor
-x 17
-y 15
-end
-arch woodfloor
-x 17
-y 16
-end
-arch woodfloor
-x 17
-y 17
-end
-arch woodfloor
-x 17
-y 18
-end
-arch woodfloor
-x 17
-y 19
-end
-arch woodfloor
-x 17
-y 20
-end
-arch wall_2_1_2
-x 17
-y 20
-end
-arch woodfloor
-x 17
-y 21
-end
-arch woodfloor
-x 17
-y 22
-end
-arch woodfloor
-x 17
-y 23
-end
-arch chair_1.1
-x 17
-y 23
-end
-arch woman
-x 17
-y 23
-friendly 1
-end
-arch woodfloor
-x 17
-y 24
-end
-arch chair_1.1
-x 17
-y 24
-end
-arch woman
-x 17
-y 24
-friendly 1
-end
-arch woodfloor
-x 17
-y 25
-end
-arch woman
-x 17
-y 25
-friendly 1
-end
-arch woodfloor
-x 17
-y 26
-end
-arch chair_1.1
-x 17
-y 26
-end
-arch woman
-x 17
-y 26
-friendly 1
-end
-arch woodfloor
-x 17
-y 27
-end
-arch chair_1.1
-x 17
-y 27
-end
-arch woman
-x 17
-y 27
-friendly 1
-end
-arch woodfloor
-x 17
-y 28
-end
-arch woodfloor
-x 17
-y 29
-end
-arch woodfloor
-x 17
-y 30
-end
-arch woodfloor
-x 17
-y 31
-end
-arch woodfloor
-x 17
-y 32
-end
-arch wall_2_1_2
-x 17
-y 32
-end
-arch woodfloor
-x 18
-end
-arch wall_2_1_2
-x 18
-end
-arch woodfloor
-x 18
-y 1
-end
-arch longtable_2_1_2
-x 18
-y 1
-end
-arch booze
-x 18
-y 1
-end
-arch woodfloor
-x 18
-y 2
-end
-arch dungeon_magic
-x 18
-y 3
-end
-arch woodfloor
-x 18
-y 3
+x 19
+y 5
 end
 arch bench_2_1_2
-x 18
-y 3
+x 19
+y 5
 move_block all
 end
 arch woodfloor
-x 18
-y 4
+x 19
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 18
+x 19
+y 6
+invisible 1
+end
+arch woodfloor
+x 19
+y 7
+end
+arch woodfloor
+x 19
+y 8
+end
+arch chair_1.1
+x 19
+y 8
+end
+arch woodfloor
+x 19
+y 9
+end
+arch table_3
+x 19
+y 9
+end
+arch woodfloor
+x 19
+y 10
+end
+arch woodfloor
+x 19
+y 11
+end
+arch woodfloor
+x 19
+y 12
+end
+arch woodfloor
+x 19
+y 13
+end
+arch woodfloor
+x 19
+y 14
+end
+arch table_3
+x 19
+y 14
+end
+arch woodfloor
+x 19
+y 15
+end
+arch chair_1.3
+x 19
+y 15
+end
+arch woodfloor
+x 19
+y 16
+end
+arch woodfloor
+x 19
+y 17
+end
+arch woodfloor
+x 19
+y 18
+end
+arch woodfloor
+x 19
+y 19
+end
+arch woodfloor
+x 19
+y 20
+end
+arch woodfloor
+x 19
+y 21
+end
+arch woodfloor
+x 19
+y 22
+end
+arch wall_2_1_2
+x 19
+y 22
+end
+arch woodfloor
+x 19
+y 23
+end
+arch woodfloor
+x 19
+y 24
+end
+arch woodfloor
+x 19
+y 25
+end
+arch chair_1.1
+x 19
+y 25
+end
+arch woman
+x 19
+y 25
+friendly 1
+end
+arch woodfloor
+x 19
+y 26
+end
+arch chair_1.1
+x 19
+y 26
+end
+arch woman
+x 19
+y 26
+friendly 1
+end
+arch woodfloor
+x 19
+y 27
+end
+arch woman
+x 19
+y 27
+friendly 1
+end
+arch woodfloor
+x 19
+y 28
+end
+arch chair_1.1
+x 19
+y 28
+end
+arch woman
+x 19
+y 28
+friendly 1
+end
+arch woodfloor
+x 19
+y 29
+end
+arch chair_1.1
+x 19
+y 29
+end
+arch woman
+x 19
+y 29
+friendly 1
+end
+arch woodfloor
+x 19
+y 30
+end
+arch woodfloor
+x 19
+y 31
+end
+arch woodfloor
+x 19
+y 32
+end
+arch woodfloor
+x 19
+y 33
+end
+arch woodfloor
+x 19
+y 34
+end
+arch wall_2_1_2
+x 19
+y 34
+end
+arch cobblestones2
+x 19
+y 35
+end
+arch cobblestones2
+x 19
+y 36
+end
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch woodfloor
+x 20
+y 2
+end
+arch wall_2_1_2
+x 20
+y 2
+end
+arch woodfloor
+x 20
+y 3
+end
+arch longtable_2_1_2
+x 20
+y 3
+end
+arch booze
+x 20
+y 3
+end
+arch woodfloor
+x 20
 y 4
+end
+arch dungeon_magic
+x 20
+y 5
+end
+arch woodfloor
+x 20
+y 5
+end
+arch bench_2_1_2
+x 20
+y 5
+move_block all
+end
+arch woodfloor
+x 20
+y 6
+end
+arch booze_table
+slaying money
+food 30
+x 20
+y 6
 invisible 1
 end
 arch chair_1.1
-x 18
-y 4
+x 20
+y 6
 end
 arch woman
 name Bar Maid
@@ -3921,237 +4610,254 @@ Samantha.  (wink)
 @match *
 Have a seat anywhere...
 endmsg
-x 18
-y 4
+x 20
+y 6
 speed 0.200000
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 18
-y 5
-end
-arch woodfloor
-x 18
-y 6
-end
-arch woodfloor
-x 18
+x 20
 y 7
 end
 arch woodfloor
-x 18
+x 20
 y 8
 end
 arch woodfloor
-x 18
+x 20
 y 9
 end
 arch woodfloor
-x 18
+x 20
 y 10
 end
 arch woodfloor
-x 18
+x 20
 y 11
 end
 arch woodfloor
-x 18
+x 20
 y 12
 end
 arch woodfloor
-x 18
+x 20
 y 13
 end
 arch woodfloor
-x 18
+x 20
 y 14
 end
 arch woodfloor
-x 18
+x 20
 y 15
 end
 arch woodfloor
-x 18
+x 20
 y 16
 end
 arch woodfloor
-x 18
+x 20
 y 17
 end
 arch woodfloor
-x 18
+x 20
 y 18
 end
 arch woodfloor
-x 18
+x 20
 y 19
 end
 arch woodfloor
-x 18
-y 20
-end
-arch wall_2_1_2
-x 18
+x 20
 y 20
 end
 arch woodfloor
-x 18
+x 20
 y 21
 end
 arch woodfloor
-x 18
+x 20
+y 22
+end
+arch wall_2_1_2
+x 20
 y 22
 end
 arch woodfloor
-x 18
-y 23
-end
-arch table_2
-x 18
+x 20
 y 23
 end
 arch woodfloor
-x 18
-y 24
-end
-arch table_2
-x 18
+x 20
 y 24
 end
 arch woodfloor
-x 18
+x 20
 y 25
 end
 arch table_2
-x 18
+x 20
 y 25
 end
 arch woodfloor
-x 18
+x 20
 y 26
 end
 arch table_2
-x 18
+x 20
 y 26
 end
 arch woodfloor
-x 18
+x 20
 y 27
 end
 arch table_2
-x 18
+x 20
 y 27
 end
 arch woodfloor
-x 18
+x 20
 y 28
 end
 arch table_2
-x 18
+x 20
 y 28
 end
 arch woodfloor
-x 18
+x 20
 y 29
 end
+arch table_2
+x 20
+y 29
+end
+arch woodfloor
+x 20
+y 30
+end
+arch table_2
+x 20
+y 30
+end
+arch woodfloor
+x 20
+y 31
+end
 arch table_4
-x 18
-y 29
-end
-arch woodfloor
-x 18
-y 30
-end
-arch altar
-x 18
-y 30
-end
-arch woodfloor
-x 18
+x 20
 y 31
 end
 arch woodfloor
-x 18
+x 20
 y 32
 end
+arch altar
+x 20
+y 32
+end
+arch woodfloor
+x 20
+y 33
+end
+arch woodfloor
+x 20
+y 34
+end
 arch window_win2
-x 18
-y 32
+x 20
+y 34
 end
-arch woodfloor
-x 19
+arch cobblestones2
+x 20
+y 35
 end
-arch wall_2_1_2
-x 19
+arch cobblestones2
+x 20
+y 36
 end
-arch woodfloor
-x 19
-y 1
+arch cobblestones2
+x 21
 end
-arch longtable_2_1_2
-x 19
-y 1
-end
-arch booze
-x 19
+arch cobblestones2
+x 21
 y 1
 end
 arch woodfloor
-x 19
+x 21
 y 2
 end
-arch dungeon_magic
-x 19
+arch wall_2_1_2
+x 21
+y 2
+end
+arch woodfloor
+x 21
+y 3
+end
+arch longtable_2_1_2
+x 21
+y 3
+end
+arch booze
+x 21
 y 3
 end
 arch woodfloor
-x 19
-y 3
+x 21
+y 4
+end
+arch dungeon_magic
+x 21
+y 5
+end
+arch woodfloor
+x 21
+y 5
 end
 arch bench_2_1_2
-x 19
-y 3
+x 21
+y 5
 move_block all
 end
 arch woodfloor
-x 19
-y 4
+x 21
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 19
-y 4
+x 21
+y 6
 invisible 1
 end
 arch chair_1.3
-x 19
-y 4
-end
-arch woodfloor
-x 19
-y 5
-end
-arch woodfloor
-x 19
+x 21
 y 6
 end
 arch woodfloor
-x 19
+x 21
 y 7
 end
 arch woodfloor
-x 19
+x 21
 y 8
 end
 arch woodfloor
-x 19
+x 21
 y 9
 end
+arch woodfloor
+x 21
+y 10
+end
+arch woodfloor
+x 21
+y 11
+end
 arch chair_1.1
-x 19
-y 9
+x 21
+y 11
 end
 arch dwarf
 msg
@@ -4168,147 +4874,147 @@ Wish I could remember where my mines were.  Then I could tell some helpful fight
 @match job
 Still looking for one...
 endmsg
-x 19
-y 9
+x 21
+y 11
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 19
-y 10
+x 21
+y 12
 end
 arch table_3
-x 19
-y 10
-end
-arch woodfloor
-x 19
-y 11
-end
-arch chair_1.3
-x 19
-y 11
-end
-arch woodfloor
-x 19
+x 21
 y 12
 end
 arch woodfloor
-x 19
+x 21
+y 13
+end
+arch chair_1.3
+x 21
 y 13
 end
 arch woodfloor
-x 19
+x 21
 y 14
 end
 arch woodfloor
-x 19
+x 21
 y 15
 end
 arch woodfloor
-x 19
+x 21
 y 16
 end
 arch woodfloor
-x 19
+x 21
 y 17
 end
 arch woodfloor
-x 19
+x 21
 y 18
 end
 arch woodfloor
-x 19
+x 21
 y 19
 end
 arch woodfloor
-x 19
-y 20
-end
-arch wall_1_3
-x 19
+x 21
 y 20
 end
 arch woodfloor
-x 19
+x 21
 y 21
 end
 arch woodfloor
-x 19
+x 21
+y 22
+end
+arch wall_1_3
+x 21
 y 22
 end
 arch woodfloor
-x 19
+x 21
 y 23
 end
-arch chair_1.2
-x 19
-y 23
-end
-arch man
-x 19
-y 23
-friendly 1
-end
 arch woodfloor
-x 19
+x 21
 y 24
 end
-arch man
-x 19
-y 24
-friendly 1
-end
 arch woodfloor
-x 19
+x 21
 y 25
 end
 arch chair_1.2
-x 19
+x 21
 y 25
 end
 arch man
-x 19
+x 21
 y 25
 friendly 1
 end
 arch woodfloor
-x 19
-y 26
-end
-arch chair_1.2
-x 19
+x 21
 y 26
 end
 arch man
-x 19
+x 21
 y 26
 friendly 1
 end
 arch woodfloor
-x 19
+x 21
 y 27
 end
+arch chair_1.2
+x 21
+y 27
+end
+arch man
+x 21
+y 27
+friendly 1
+end
 arch woodfloor
-x 19
+x 21
 y 28
 end
 arch chair_1.2
-x 19
+x 21
 y 28
 end
+arch man
+x 21
+y 28
+friendly 1
+end
 arch woodfloor
-x 19
+x 21
 y 29
 end
 arch woodfloor
-x 19
+x 21
+y 30
+end
+arch chair_1.2
+x 21
 y 30
 end
 arch woodfloor
-x 19
+x 21
 y 31
 end
+arch woodfloor
+x 21
+y 32
+end
+arch woodfloor
+x 21
+y 33
+end
 arch c_man
 msg
 @match job
@@ -4322,124 +5028,141 @@ Oh, WE HAVE A WINNER, next game in 10 minutes.
 @match *
 B - 5 ... B -
 endmsg
-x 19
-y 31
+x 21
+y 33
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 19
-y 32
+x 21
+y 34
 end
 arch wall_2_1_2
-x 19
-y 32
+x 21
+y 34
 end
-arch woodfloor
-x 20
+arch cobblestones2
+x 21
+y 35
 end
-arch wall_2_1_2
-x 20
+arch cobblestones2
+x 21
+y 36
 end
-arch woodfloor
-x 20
-y 1
+arch cobblestones2
+x 22
 end
-arch longtable_2_1_2
-x 20
-y 1
-end
-arch booze
-x 20
+arch cobblestones2
+x 22
 y 1
 end
 arch woodfloor
-x 20
+x 22
 y 2
 end
-arch dungeon_magic
-x 20
+arch wall_2_1_2
+x 22
+y 2
+end
+arch woodfloor
+x 22
+y 3
+end
+arch longtable_2_1_2
+x 22
+y 3
+end
+arch booze
+x 22
 y 3
 end
 arch woodfloor
-x 20
-y 3
+x 22
+y 4
+end
+arch dungeon_magic
+x 22
+y 5
+end
+arch woodfloor
+x 22
+y 5
 end
 arch bench_2_1_2
-x 20
-y 3
+x 22
+y 5
 move_block all
 end
 arch woodfloor
-x 20
-y 4
+x 22
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 20
-y 4
+x 22
+y 6
 invisible 1
 end
 arch woodfloor
-x 20
-y 5
-end
-arch woodfloor
-x 20
-y 6
-end
-arch woodfloor
-x 20
+x 22
 y 7
 end
 arch woodfloor
-x 20
+x 22
 y 8
 end
 arch woodfloor
-x 20
+x 22
 y 9
 end
 arch woodfloor
-x 20
-y 10
-end
-arch chair_1.2
-x 20
+x 22
 y 10
 end
 arch woodfloor
-x 20
+x 22
 y 11
 end
 arch woodfloor
-x 20
+x 22
+y 12
+end
+arch chair_1.2
+x 22
 y 12
 end
 arch woodfloor
-x 20
+x 22
 y 13
 end
 arch woodfloor
-x 20
+x 22
 y 14
 end
 arch woodfloor
-x 20
+x 22
 y 15
 end
 arch woodfloor
-x 20
+x 22
 y 16
 end
 arch woodfloor
-x 20
+x 22
 y 17
 end
+arch woodfloor
+x 22
+y 18
+end
+arch woodfloor
+x 22
+y 19
+end
 arch chair_1.4
-x 20
-y 17
+x 22
+y 19
 end
 arch fighter
 name Wounded fighter
@@ -4458,539 +5181,573 @@ The castle is in a valley with some hills and woods.
 Buzz off.  Can't you see I am in pain!
 endmsg
 hp 130
-x 20
-y 17
+x 22
+y 19
 level 12
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 20
-y 18
+x 22
+y 20
 end
 arch chair_1.4
-x 20
-y 18
-end
-arch woodfloor
-x 20
-y 19
-end
-arch woodfloor
-x 20
+x 22
 y 20
 end
 arch woodfloor
-x 20
+x 22
 y 21
 end
 arch woodfloor
-x 20
+x 22
 y 22
 end
 arch woodfloor
-x 20
+x 22
 y 23
 end
-arch chair_1.1
-x 20
-y 23
-end
-arch woman
-x 20
-y 23
-friendly 1
-end
 arch woodfloor
-x 20
+x 22
 y 24
 end
-arch chair_1.1
-x 20
-y 24
-end
-arch woman
-x 20
-y 24
-friendly 1
-end
 arch woodfloor
-x 20
+x 22
+y 25
+end
+arch chair_1.1
+x 22
 y 25
 end
 arch woman
-x 20
+x 22
 y 25
 friendly 1
 end
 arch woodfloor
-x 20
+x 22
 y 26
 end
 arch chair_1.1
-x 20
+x 22
 y 26
 end
 arch woman
-x 20
+x 22
 y 26
 friendly 1
 end
 arch woodfloor
-x 20
-y 27
-end
-arch chair_1.1
-x 20
+x 22
 y 27
 end
 arch woman
-x 20
+x 22
 y 27
 friendly 1
 end
 arch woodfloor
-x 20
+x 22
 y 28
 end
+arch chair_1.1
+x 22
+y 28
+end
+arch woman
+x 22
+y 28
+friendly 1
+end
 arch woodfloor
-x 20
+x 22
 y 29
 end
-arch woodfloor
-x 20
-y 30
-end
 arch chair_1.1
-x 20
+x 22
+y 29
+end
+arch woman
+x 22
+y 29
+friendly 1
+end
+arch woodfloor
+x 22
 y 30
 end
 arch woodfloor
-x 20
+x 22
 y 31
 end
 arch woodfloor
-x 20
+x 22
 y 32
 end
-arch wall_2_1_2
-x 20
+arch chair_1.1
+x 22
 y 32
 end
 arch woodfloor
-x 21
+x 22
+y 33
+end
+arch woodfloor
+x 22
+y 34
 end
 arch wall_2_1_2
-x 21
+x 22
+y 34
 end
-arch woodfloor
-x 21
-y 1
+arch cobblestones2
+x 22
+y 35
 end
-arch longtable_2_1_2
-x 21
-y 1
+arch cobblestones2
+x 22
+y 36
 end
-arch booze
-x 21
+arch cobblestones2
+x 23
+end
+arch cobblestones2
+x 23
 y 1
 end
 arch woodfloor
-x 21
+x 23
 y 2
 end
-arch dungeon_magic
-x 21
+arch wall_2_1_2
+x 23
+y 2
+end
+arch woodfloor
+x 23
+y 3
+end
+arch longtable_2_1_2
+x 23
+y 3
+end
+arch booze
+x 23
 y 3
 end
 arch woodfloor
-x 21
-y 3
+x 23
+y 4
+end
+arch dungeon_magic
+x 23
+y 5
+end
+arch woodfloor
+x 23
+y 5
 end
 arch bench_2_1_2
-x 21
-y 3
+x 23
+y 5
 move_block all
 end
 arch woodfloor
-x 21
-y 4
+x 23
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 21
-y 4
+x 23
+y 6
 invisible 1
 end
 arch chair_1.3
-x 21
-y 4
-end
-arch woodfloor
-x 21
-y 5
-end
-arch woodfloor
-x 21
+x 23
 y 6
 end
 arch woodfloor
-x 21
-y 7
-end
-arch cwall_0
-x 21
+x 23
 y 7
 end
 arch woodfloor
-x 21
+x 23
 y 8
 end
 arch woodfloor
-x 21
+x 23
+y 9
+end
+arch cwall_0
+x 23
 y 9
 end
 arch woodfloor
-x 21
+x 23
 y 10
 end
 arch woodfloor
-x 21
+x 23
 y 11
 end
 arch woodfloor
-x 21
+x 23
 y 12
 end
 arch woodfloor
-x 21
+x 23
 y 13
 end
 arch woodfloor
-x 21
+x 23
 y 14
 end
+arch woodfloor
+x 23
+y 15
+end
+arch woodfloor
+x 23
+y 16
+end
 arch cwall_0
-x 21
-y 14
+x 23
+y 16
 end
 arch woodfloor
-x 21
-y 15
+x 23
+y 17
 end
 arch chair_1.1
-x 21
-y 15
-end
-arch woodfloor
-x 21
-y 16
-end
-arch table_3
-x 21
-y 16
-end
-arch woodfloor
-x 21
-y 17
-end
-arch table_3
-x 21
+x 23
 y 17
 end
 arch woodfloor
-x 21
+x 23
 y 18
 end
 arch table_3
-x 21
+x 23
 y 18
 end
 arch woodfloor
-x 21
+x 23
+y 19
+end
+arch table_3
+x 23
 y 19
 end
 arch woodfloor
-x 21
+x 23
+y 20
+end
+arch table_3
+x 23
 y 20
 end
 arch woodfloor
-x 21
+x 23
 y 21
 end
 arch woodfloor
-x 21
+x 23
 y 22
 end
 arch woodfloor
-x 21
-y 23
-end
-arch table_2
-x 21
+x 23
 y 23
 end
 arch woodfloor
-x 21
-y 24
-end
-arch table_2
-x 21
+x 23
 y 24
 end
 arch woodfloor
-x 21
+x 23
 y 25
 end
 arch table_2
-x 21
+x 23
 y 25
 end
 arch woodfloor
-x 21
+x 23
 y 26
 end
 arch table_2
-x 21
+x 23
 y 26
 end
 arch woodfloor
-x 21
+x 23
 y 27
 end
 arch table_2
-x 21
+x 23
 y 27
 end
 arch woodfloor
-x 21
+x 23
 y 28
 end
 arch table_2
-x 21
+x 23
 y 28
 end
 arch woodfloor
-x 21
+x 23
 y 29
 end
 arch table_2
-x 21
+x 23
 y 29
 end
 arch woodfloor
-x 21
+x 23
+y 30
+end
+arch table_2
+x 23
 y 30
 end
 arch woodfloor
-x 21
+x 23
+y 31
+end
+arch table_2
+x 23
 y 31
 end
 arch woodfloor
-x 21
-y 32
-end
-arch wall_2_1_2
-x 21
+x 23
 y 32
 end
 arch woodfloor
-x 22
+x 23
+y 33
+end
+arch woodfloor
+x 23
+y 34
 end
 arch wall_2_1_2
-x 22
+x 23
+y 34
 end
-arch woodfloor
-x 22
-y 1
+arch cobblestones2
+x 23
+y 35
 end
-arch longtable_2_1_2
-x 22
-y 1
+arch cobblestones2
+x 23
+y 36
 end
-arch booze
-x 22
+arch cobblestones2
+x 24
+end
+arch cobblestones2
+x 24
 y 1
 end
 arch woodfloor
-x 22
+x 24
 y 2
 end
-arch dungeon_magic
-x 22
+arch wall_2_1_2
+x 24
+y 2
+end
+arch woodfloor
+x 24
+y 3
+end
+arch longtable_2_1_2
+x 24
+y 3
+end
+arch booze
+x 24
 y 3
 end
 arch woodfloor
-x 22
-y 3
+x 24
+y 4
+end
+arch dungeon_magic
+x 24
+y 5
+end
+arch woodfloor
+x 24
+y 5
 end
 arch bench_2_1_2
-x 22
-y 3
+x 24
+y 5
 move_block all
 end
 arch woodfloor
-x 22
-y 4
+x 24
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 22
-y 4
+x 24
+y 6
 invisible 1
 end
 arch woodfloor
-x 22
-y 5
-end
-arch woodfloor
-x 22
-y 6
-end
-arch woodfloor
-x 22
+x 24
 y 7
 end
 arch woodfloor
-x 22
+x 24
 y 8
 end
 arch woodfloor
-x 22
+x 24
 y 9
 end
 arch woodfloor
-x 22
+x 24
 y 10
 end
 arch woodfloor
-x 22
+x 24
 y 11
 end
 arch woodfloor
-x 22
+x 24
 y 12
 end
 arch woodfloor
-x 22
+x 24
 y 13
 end
 arch woodfloor
-x 22
+x 24
 y 14
 end
 arch woodfloor
-x 22
+x 24
 y 15
 end
 arch woodfloor
-x 22
-y 16
-end
-arch chair_1.2
-x 22
+x 24
 y 16
 end
 arch woodfloor
-x 22
+x 24
 y 17
 end
 arch woodfloor
-x 22
+x 24
 y 18
 end
 arch chair_1.2
-x 22
+x 24
 y 18
 end
 arch woodfloor
-x 22
+x 24
 y 19
 end
 arch woodfloor
-x 22
+x 24
 y 20
 end
-arch wall_1_4
-x 22
+arch chair_1.2
+x 24
 y 20
 end
 arch woodfloor
-x 22
+x 24
 y 21
 end
 arch woodfloor
-x 22
+x 24
+y 22
+end
+arch wall_1_4
+x 24
 y 22
 end
 arch woodfloor
-x 22
+x 24
 y 23
 end
-arch chair_1.2
-x 22
-y 23
-end
-arch man
-x 22
-y 23
-friendly 1
-end
 arch woodfloor
-x 22
+x 24
 y 24
 end
-arch chair_1.2
-x 22
-y 24
-end
-arch man
-x 22
-y 24
-friendly 1
-end
 arch woodfloor
-x 22
+x 24
 y 25
 end
 arch chair_1.2
-x 22
+x 24
 y 25
 end
 arch man
-x 22
+x 24
 y 25
 friendly 1
 end
 arch woodfloor
-x 22
+x 24
+y 26
+end
+arch chair_1.2
+x 24
 y 26
 end
 arch man
-x 22
+x 24
 y 26
 friendly 1
 end
 arch woodfloor
-x 22
+x 24
 y 27
 end
 arch chair_1.2
-x 22
+x 24
 y 27
 end
 arch man
-x 22
+x 24
 y 27
 friendly 1
 end
 arch woodfloor
-x 22
+x 24
 y 28
 end
 arch man
+x 24
+y 28
+friendly 1
+end
+arch woodfloor
+x 24
+y 29
+end
+arch chair_1.2
+x 24
+y 29
+end
+arch man
+x 24
+y 29
+friendly 1
+end
+arch woodfloor
+x 24
+y 30
+end
+arch man
 msg
 @match mark
 Ya that's me.  Bugger off, I'm on a roll here.
@@ -5012,8 +5769,8 @@ Look, mate... Isn't it obvious?
 Go away, I'm busy.
 N 15
 endmsg
-x 22
-y 28
+x 24
+y 30
 friendly 1
 arch event_say
 name scorn/taverns/mark.msg
@@ -5022,69 +5779,86 @@ slaying /python/dialog/npc_dialog.py
 end
 end
 arch woodfloor
-x 22
-y 29
-end
-arch woodfloor
-x 22
-y 30
-end
-arch woodfloor
-x 22
+x 24
 y 31
 end
 arch woodfloor
-x 22
-y 32
-end
-arch wall_2_1_2
-x 22
+x 24
 y 32
 end
 arch woodfloor
-x 23
+x 24
+y 33
+end
+arch woodfloor
+x 24
+y 34
 end
 arch wall_2_1_2
-x 23
+x 24
+y 34
 end
-arch woodfloor
-x 23
-y 1
+arch cobblestones2
+x 24
+y 35
 end
-arch longtable_2_1_2
-x 23
-y 1
+arch cobblestones2
+x 24
+y 36
 end
-arch booze
-x 23
+arch cobblestones2
+x 25
+end
+arch cobblestones2
+x 25
 y 1
 end
 arch woodfloor
-x 23
+x 25
 y 2
 end
-arch dungeon_magic
-x 23
+arch wall_2_1_2
+x 25
+y 2
+end
+arch woodfloor
+x 25
+y 3
+end
+arch longtable_2_1_2
+x 25
+y 3
+end
+arch booze
+x 25
 y 3
 end
 arch woodfloor
-x 23
-y 3
+x 25
+y 4
+end
+arch dungeon_magic
+x 25
+y 5
+end
+arch woodfloor
+x 25
+y 5
 end
 arch bench_2_1_2
-x 23
-y 3
+x 25
+y 5
 move_block all
 end
 arch woodfloor
-x 23
-y 4
+x 25
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 23
-y 4
+x 25
+y 6
 invisible 1
 end
 arch beholder
@@ -5101,163 +5875,180 @@ Psionic reader...  Why do you ask?
 @match *
 (Mumble) I wonder if anyone here knows what I am... or why I'm here? (Mumble)
 endmsg
-x 23
-y 4
+x 25
+y 6
 friendly 1
 end
 arch woodfloor
-x 23
-y 5
-end
-arch woodfloor
-x 23
-y 6
-end
-arch woodfloor
-x 23
+x 25
 y 7
 end
 arch woodfloor
-x 23
+x 25
 y 8
 end
 arch woodfloor
-x 23
+x 25
 y 9
 end
 arch woodfloor
-x 23
+x 25
 y 10
 end
 arch woodfloor
-x 23
+x 25
 y 11
 end
 arch woodfloor
-x 23
+x 25
 y 12
 end
 arch woodfloor
-x 23
+x 25
 y 13
 end
 arch woodfloor
-x 23
+x 25
 y 14
 end
 arch woodfloor
-x 23
+x 25
 y 15
 end
 arch woodfloor
-x 23
+x 25
 y 16
 end
 arch woodfloor
-x 23
+x 25
 y 17
 end
 arch woodfloor
-x 23
+x 25
 y 18
 end
 arch woodfloor
-x 23
+x 25
 y 19
 end
 arch woodfloor
-x 23
-y 20
-end
-arch wall_2_1_2
-x 23
+x 25
 y 20
 end
 arch woodfloor
-x 23
+x 25
 y 21
 end
 arch woodfloor
-x 23
+x 25
+y 22
+end
+arch wall_2_1_2
+x 25
 y 22
 end
 arch woodfloor
-x 23
+x 25
 y 23
 end
 arch woodfloor
-x 23
+x 25
 y 24
 end
 arch woodfloor
-x 23
+x 25
 y 25
 end
 arch woodfloor
-x 23
+x 25
 y 26
 end
 arch woodfloor
-x 23
+x 25
 y 27
 end
 arch woodfloor
-x 23
+x 25
 y 28
 end
 arch woodfloor
-x 23
+x 25
 y 29
 end
 arch woodfloor
-x 23
+x 25
 y 30
 end
 arch woodfloor
-x 23
+x 25
 y 31
 end
 arch woodfloor
-x 23
-y 32
-end
-arch wall_2_1_2
-x 23
+x 25
 y 32
 end
 arch woodfloor
-x 24
+x 25
+y 33
+end
+arch woodfloor
+x 25
+y 34
 end
 arch wall_2_1_2
-x 24
+x 25
+y 34
 end
-arch woodfloor
-x 24
-y 1
+arch cobblestones2
+x 25
+y 35
 end
-arch longtable_2_1_2
-x 24
-y 1
+arch cobblestones2
+x 25
+y 36
 end
-arch booze
-x 24
+arch cobblestones2
+x 26
+end
+arch cobblestones2
+x 26
 y 1
 end
 arch woodfloor
-x 24
+x 26
 y 2
 end
-arch dungeon_magic
-x 24
+arch wall_2_1_2
+x 26
+y 2
+end
+arch woodfloor
+x 26
+y 3
+end
+arch longtable_2_1_2
+x 26
+y 3
+end
+arch booze
+x 26
 y 3
 end
 arch woodfloor
-x 24
-y 3
+x 26
+y 4
+end
+arch dungeon_magic
+x 26
+y 5
+end
+arch woodfloor
+x 26
+y 5
 end
 arch bench_2_1_2
-x 24
-y 3
+x 26
+y 5
 move_block all
 end
 arch magic_ear
@@ -5265,59 +6056,59 @@ msg
 @match drink|booze|beer
 If you want something to drink, it will be 3 gp.
 endmsg
-x 24
-y 4
+x 26
+y 6
 end
 arch woodfloor
-x 24
-y 4
+x 26
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 24
-y 4
+x 26
+y 6
 invisible 1
 end
 arch chair_1.3
-x 24
-y 4
-end
-arch woodfloor
-x 24
-y 5
-end
-arch woodfloor
-x 24
+x 26
 y 6
 end
 arch woodfloor
-x 24
-y 7
-end
-arch chair_1.1
-x 24
+x 26
 y 7
 end
 arch woodfloor
-x 24
+x 26
 y 8
 end
 arch woodfloor
-x 24
+x 26
+y 9
+end
+arch chair_1.1
+x 26
 y 9
 end
 arch woodfloor
-x 24
+x 26
 y 10
 end
 arch woodfloor
-x 24
+x 26
 y 11
 end
+arch woodfloor
+x 26
+y 12
+end
+arch woodfloor
+x 26
+y 13
+end
 arch chair_1.4
-x 24
-y 11
+x 26
+y 13
 end
 arch pirate
 name sailor
@@ -5339,251 +6130,268 @@ You must be jokin' laddy?
 @match *
 Arrrr.  I've seen many things on my voyages.
 endmsg
-x 24
-y 11
+x 26
+y 13
 friendly 1
 end
 arch woodfloor
-x 24
-y 12
-end
-arch woodfloor
-x 24
-y 13
-end
-arch woodfloor
-x 24
+x 26
 y 14
 end
 arch woodfloor
-x 24
+x 26
 y 15
 end
 arch woodfloor
-x 24
-y 16
-end
-arch chair_1.4
-x 24
+x 26
 y 16
 end
 arch woodfloor
-x 24
+x 26
 y 17
 end
 arch woodfloor
-x 24
+x 26
+y 18
+end
+arch chair_1.4
+x 26
 y 18
 end
 arch woodfloor
-x 24
+x 26
 y 19
 end
 arch woodfloor
-x 24
+x 26
 y 20
 end
+arch woodfloor
+x 26
+y 21
+end
+arch woodfloor
+x 26
+y 22
+end
 arch wall_3_3
-x 24
-y 20
-end
-arch woodfloor
-x 24
-y 21
-end
-arch wall_2_1_1
-x 24
-y 21
-end
-arch woodfloor
-x 24
-y 22
-end
-arch wall_2_1_1
-x 24
+x 26
 y 22
 end
 arch woodfloor
-x 24
+x 26
 y 23
 end
 arch wall_2_1_1
-x 24
+x 26
 y 23
 end
 arch woodfloor
-x 24
+x 26
 y 24
 end
 arch wall_2_1_1
-x 24
+x 26
 y 24
 end
 arch woodfloor
-x 24
+x 26
 y 25
 end
 arch wall_2_1_1
-x 24
+x 26
 y 25
 end
 arch woodfloor
-x 24
+x 26
 y 26
 end
 arch wall_2_1_1
-x 24
+x 26
 y 26
 end
 arch woodfloor
-x 24
+x 26
 y 27
 end
 arch wall_2_1_1
-x 24
+x 26
 y 27
 end
 arch woodfloor
-x 24
+x 26
 y 28
 end
 arch wall_2_1_1
-x 24
+x 26
 y 28
 end
 arch woodfloor
-x 24
+x 26
 y 29
 end
 arch wall_2_1_1
-x 24
+x 26
 y 29
 end
 arch woodfloor
-x 24
+x 26
 y 30
 end
 arch wall_2_1_1
-x 24
+x 26
 y 30
 end
 arch woodfloor
-x 24
+x 26
 y 31
 end
 arch wall_2_1_1
-x 24
+x 26
 y 31
 end
 arch woodfloor
-x 24
+x 26
 y 32
 end
+arch wall_2_1_1
+x 26
+y 32
+end
+arch woodfloor
+x 26
+y 33
+end
+arch wall_2_1_1
+x 26
+y 33
+end
+arch woodfloor
+x 26
+y 34
+end
 arch wall_3_1
-x 24
-y 32
+x 26
+y 34
 end
-arch woodfloor
-x 25
+arch cobblestones2
+x 26
+y 35
 end
-arch wall_2_1_2
-x 25
+arch cobblestones2
+x 26
+y 36
 end
-arch woodfloor
-x 25
-y 1
+arch cobblestones2
+x 27
 end
-arch longtable_1_3
-x 25
-y 1
-end
-arch booze
-x 25
+arch cobblestones2
+x 27
 y 1
 end
 arch woodfloor
-x 25
+x 27
 y 2
 end
-arch dungeon_magic
-x 25
+arch wall_2_1_2
+x 27
+y 2
+end
+arch woodfloor
+x 27
+y 3
+end
+arch longtable_1_3
+x 27
+y 3
+end
+arch booze
+x 27
 y 3
 end
 arch woodfloor
-x 25
-y 3
+x 27
+y 4
+end
+arch dungeon_magic
+x 27
+y 5
+end
+arch woodfloor
+x 27
+y 5
 end
 arch bench_2_1_2
-x 25
-y 3
+x 27
+y 5
 move_block all
 end
 arch woodfloor
-x 25
-y 4
+x 27
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 25
-y 4
+x 27
+y 6
 invisible 1
 end
 arch woodfloor
-x 25
-y 5
-end
-arch woodfloor
-x 25
-y 6
-end
-arch woodfloor
-x 25
-y 7
-end
-arch table_3
-x 25
+x 27
 y 7
 end
 arch woodfloor
-x 25
+x 27
 y 8
 end
 arch woodfloor
-x 25
+x 27
+y 9
+end
+arch table_3
+x 27
 y 9
 end
 arch woodfloor
-x 25
+x 27
 y 10
 end
 arch woodfloor
-x 25
-y 11
-end
-arch table_3
-x 25
+x 27
 y 11
 end
 arch woodfloor
-x 25
+x 27
 y 12
 end
 arch woodfloor
-x 25
+x 27
+y 13
+end
+arch table_3
+x 27
 y 13
 end
 arch woodfloor
-x 25
+x 27
 y 14
 end
 arch woodfloor
-x 25
+x 27
 y 15
 end
+arch woodfloor
+x 27
+y 16
+end
+arch woodfloor
+x 27
+y 17
+end
 arch chair_1.1
-x 25
-y 15
+x 27
+y 17
 end
 arch elf_1
 msg
@@ -5607,163 +6415,180 @@ I don't know any more than that.  If you ask me, unsurpassable power sounds good
 Have you ever been to pupland?
 endmsg
 face elf.151
-x 25
-y 15
+x 27
+y 17
 is_animated 0
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 25
-y 16
+x 27
+y 18
 end
 arch table_3
-x 25
-y 16
-end
-arch woodfloor
-x 25
-y 17
-end
-arch woodfloor
-x 25
+x 27
 y 18
 end
 arch woodfloor
-x 25
+x 27
 y 19
 end
 arch woodfloor
-x 25
-y 20
-end
-arch wall_2_1_2
-x 25
+x 27
 y 20
 end
 arch woodfloor
-x 25
+x 27
 y 21
 end
 arch woodfloor
-x 25
+x 27
+y 22
+end
+arch wall_2_1_2
+x 27
 y 22
 end
 arch woodfloor
-x 25
+x 27
 y 23
 end
 arch woodfloor
-x 25
+x 27
 y 24
 end
 arch woodfloor
-x 25
+x 27
 y 25
 end
 arch woodfloor
-x 25
+x 27
 y 26
 end
 arch woodfloor
-x 25
-y 27
-end
-arch c_woman
-x 25
+x 27
 y 27
 end
 arch woodfloor
-x 25
+x 27
 y 28
 end
 arch woodfloor
-x 25
+x 27
+y 29
+end
+arch c_woman
+x 27
 y 29
 end
 arch woodfloor
-x 25
+x 27
 y 30
 end
 arch woodfloor
-x 25
+x 27
 y 31
 end
 arch woodfloor
-x 25
-y 32
-end
-arch wall_2_1_2
-x 25
+x 27
 y 32
 end
 arch woodfloor
-x 26
+x 27
+y 33
+end
+arch woodfloor
+x 27
+y 34
 end
 arch wall_2_1_2
-x 26
+x 27
+y 34
+end
+arch cobblestones2
+x 27
+y 35
+end
+arch cobblestones2
+x 27
+y 36
+end
+arch cobblestones2
+x 28
+end
+arch cobblestones2
+x 28
+y 1
+end
+arch woodfloor
+x 28
+y 2
+end
+arch wall_2_1_2
+x 28
+y 2
 end
 arch dungeon_magic
-x 26
-y 1
+x 28
+y 3
 end
 arch woodfloor
-x 26
-y 1
+x 28
+y 3
 end
 arch bench_1_1
-x 26
-y 1
+x 28
+y 3
 move_block all
 end
 arch dungeon_magic
-x 26
-y 2
+x 28
+y 4
 end
 arch woodfloor
-x 26
-y 2
+x 28
+y 4
 end
 arch bench_2_1_1
-x 26
-y 2
+x 28
+y 4
 end
 arch dungeon_magic
-x 26
-y 3
+x 28
+y 5
 end
 arch woodfloor
-x 26
-y 3
+x 28
+y 5
 end
 arch bench_2_2_4
-x 26
-y 3
+x 28
+y 5
 move_block all
 end
 arch woodfloor
-x 26
-y 4
+x 28
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 26
-y 4
+x 28
+y 6
 invisible 1
 end
 arch woodfloor
-x 26
-y 5
-end
-arch woodfloor
-x 26
-y 6
-end
-arch woodfloor
-x 26
+x 28
 y 7
 end
+arch woodfloor
+x 28
+y 8
+end
+arch woodfloor
+x 28
+y 9
+end
 arch guildmaster
 name Brum the Ancient
 msg
@@ -5784,537 +6609,588 @@ Yes, I heard that somewhere in the depths of the castle dungeon rests a piece of
 @match *
 Would you like to hear a story?
 endmsg
-x 26
-y 7
+x 28
+y 9
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 26
-y 8
-end
-arch woodfloor
-x 26
-y 9
-end
-arch woodfloor
-x 26
-y 10
-end
-arch chair_1.1
-x 26
+x 28
 y 10
 end
 arch woodfloor
-x 26
+x 28
 y 11
 end
 arch woodfloor
-x 26
+x 28
 y 12
 end
 arch chair_1.1
-x 26
+x 28
 y 12
 end
 arch woodfloor
-x 26
+x 28
 y 13
 end
 arch woodfloor
-x 26
+x 28
+y 14
+end
+arch chair_1.1
+x 28
 y 14
 end
 arch woodfloor
-x 26
+x 28
 y 15
 end
 arch woodfloor
-x 26
+x 28
 y 16
 end
+arch woodfloor
+x 28
+y 17
+end
+arch woodfloor
+x 28
+y 18
+end
 arch chair_1.2
-x 26
-y 16
+x 28
+y 18
 end
 arch elf_1
 face elf.171
-x 26
-y 16
+x 28
+y 18
 is_animated 0
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 26
-y 17
-end
-arch woodfloor
-x 26
-y 18
-end
-arch woodfloor
-x 26
+x 28
 y 19
 end
 arch woodfloor
-x 26
-y 20
-end
-arch wall_2_1_2
-x 26
+x 28
 y 20
 end
 arch woodfloor
-x 26
+x 28
 y 21
 end
 arch woodfloor
-x 26
+x 28
 y 22
 end
-arch chair_2.4
-x 26
+arch wall_2_1_2
+x 28
 y 22
 end
 arch woodfloor
-x 26
+x 28
 y 23
 end
+arch woodfloor
+x 28
+y 24
+end
 arch chair_2.4
-x 26
-y 23
+x 28
+y 24
+end
+arch woodfloor
+x 28
+y 25
+end
+arch chair_2.4
+x 28
+y 25
 end
 arch warrior_1
-x 26
-y 23
+x 28
+y 25
 end
 arch woodfloor
-x 26
-y 24
+x 28
+y 26
 end
 arch chair_2.4
-x 26
-y 24
+x 28
+y 26
 end
 arch ninja_1
-x 26
-y 24
-end
-arch woodfloor
-x 26
-y 25
-end
-arch woodfloor
-x 26
+x 28
 y 26
 end
 arch woodfloor
-x 26
+x 28
 y 27
 end
 arch woodfloor
-x 26
+x 28
 y 28
 end
 arch woodfloor
-x 26
+x 28
 y 29
 end
 arch woodfloor
-x 26
+x 28
 y 30
 end
 arch woodfloor
-x 26
+x 28
 y 31
 end
 arch woodfloor
-x 26
-y 32
-end
-arch wall_2_1_2
-x 26
+x 28
 y 32
 end
 arch woodfloor
-x 27
+x 28
+y 33
+end
+arch woodfloor
+x 28
+y 34
 end
 arch wall_2_1_2
-x 27
+x 28
+y 34
 end
-arch woodfloor
-x 27
+arch cobblestones2
+x 28
+y 35
+end
+arch cobblestones2
+x 28
+y 36
+end
+arch cobblestones2
+x 29
+end
+arch cobblestones2
+x 29
 y 1
 end
-arch booze_table
-slaying money
-food 30
-x 27
-y 1
-invisible 1
-end
 arch woodfloor
-x 27
+x 29
 y 2
 end
-arch booze_table
-slaying money
-food 30
-x 27
+arch wall_2_1_2
+x 29
 y 2
-invisible 1
 end
 arch woodfloor
-x 27
+x 29
 y 3
 end
 arch booze_table
 slaying money
 food 30
-x 27
+x 29
 y 3
 invisible 1
 end
 arch woodfloor
-x 27
+x 29
 y 4
 end
+arch booze_table
+slaying money
+food 30
+x 29
+y 4
+invisible 1
+end
+arch woodfloor
+x 29
+y 5
+end
+arch booze_table
+slaying money
+food 30
+x 29
+y 5
+invisible 1
+end
+arch woodfloor
+x 29
+y 6
+end
 arch table_3
-x 27
-y 4
+x 29
+y 6
 end
 arch booze_table
 slaying money
 food 30
-x 27
-y 4
+x 29
+y 6
 invisible 1
 end
 arch woodfloor
-x 27
-y 5
-end
-arch woodfloor
-x 27
-y 6
-end
-arch woodfloor
-x 27
+x 29
 y 7
 end
 arch woodfloor
-x 27
+x 29
 y 8
 end
 arch woodfloor
-x 27
+x 29
 y 9
 end
 arch woodfloor
-x 27
+x 29
 y 10
 end
 arch woodfloor
-x 27
+x 29
 y 11
 end
 arch woodfloor
-x 27
+x 29
 y 12
 end
 arch woodfloor
-x 27
+x 29
 y 13
 end
 arch woodfloor
-x 27
+x 29
 y 14
 end
 arch woodfloor
-x 27
+x 29
 y 15
 end
 arch woodfloor
-x 27
+x 29
 y 16
 end
 arch woodfloor
-x 27
+x 29
 y 17
 end
 arch woodfloor
-x 27
+x 29
 y 18
 end
 arch woodfloor
-x 27
+x 29
 y 19
 end
 arch woodfloor
-x 27
-y 20
-end
-arch wall_2_1_2
-x 27
+x 29
 y 20
 end
 arch woodfloor
-x 27
+x 29
 y 21
 end
 arch woodfloor
-x 27
+x 29
 y 22
 end
+arch wall_2_1_2
+x 29
+y 22
+end
+arch woodfloor
+x 29
+y 23
+end
+arch woodfloor
+x 29
+y 24
+end
 arch chair_2.1
-x 27
-y 22
+x 29
+y 24
 end
 arch c_woman
-x 27
-y 22
+x 29
+y 24
 end
 arch woodfloor
-x 27
-y 23
+x 29
+y 25
 end
 arch table_4
-x 27
-y 23
-end
-arch woodfloor
-x 27
-y 24
-end
-arch chair_2.3
-x 27
-y 24
-end
-arch woodfloor
-x 27
+x 29
 y 25
 end
 arch woodfloor
-x 27
+x 29
+y 26
+end
+arch chair_2.3
+x 29
 y 26
 end
 arch woodfloor
-x 27
+x 29
 y 27
 end
 arch woodfloor
-x 27
+x 29
 y 28
 end
 arch woodfloor
-x 27
+x 29
 y 29
 end
 arch woodfloor
-x 27
+x 29
 y 30
 end
 arch woodfloor
-x 27
+x 29
 y 31
 end
 arch woodfloor
-x 27
-y 32
-end
-arch wall_2_1_2
-x 27
+x 29
 y 32
 end
 arch woodfloor
-x 28
-end
-arch wall_2_1_2
-x 28
+x 29
+y 33
 end
 arch woodfloor
-x 28
+x 29
+y 34
+end
+arch wall_2_1_2
+x 29
+y 34
+end
+arch cobblestones2
+x 29
+y 35
+end
+arch cobblestones2
+x 29
+y 36
+end
+arch cobblestones2
+x 30
+end
+arch cobblestones2
+x 30
 y 1
 end
 arch woodfloor
-x 28
+x 30
+y 2
+end
+arch wall_2_1_2
+x 30
 y 2
 end
 arch woodfloor
-x 28
-y 3
-end
-arch chair_1.1
-x 28
+x 30
 y 3
 end
 arch woodfloor
-x 28
+x 30
 y 4
 end
 arch woodfloor
-x 28
+x 30
+y 5
+end
+arch chair_1.1
+x 30
 y 5
 end
 arch woodfloor
-x 28
+x 30
 y 6
 end
 arch woodfloor
-x 28
-y 7
-end
-arch cwall_0
-x 28
+x 30
 y 7
 end
 arch woodfloor
-x 28
+x 30
 y 8
 end
 arch woodfloor
-x 28
+x 30
+y 9
+end
+arch cwall_0
+x 30
 y 9
 end
 arch woodfloor
-x 28
+x 30
 y 10
 end
 arch woodfloor
-x 28
+x 30
 y 11
 end
 arch woodfloor
-x 28
+x 30
 y 12
 end
 arch woodfloor
-x 28
+x 30
 y 13
 end
 arch woodfloor
-x 28
-y 14
-end
-arch cwall_0
-x 28
+x 30
 y 14
 end
 arch woodfloor
-x 28
+x 30
 y 15
 end
 arch woodfloor
-x 28
+x 30
+y 16
+end
+arch cwall_0
+x 30
 y 16
 end
 arch woodfloor
-x 28
+x 30
 y 17
 end
 arch woodfloor
-x 28
+x 30
 y 18
 end
 arch woodfloor
-x 28
+x 30
 y 19
 end
 arch woodfloor
-x 28
-y 20
-end
-arch wall_1_3
-x 28
+x 30
 y 20
 end
 arch woodfloor
-x 28
+x 30
 y 21
 end
 arch woodfloor
-x 28
+x 30
 y 22
 end
-arch chair_2.2
-x 28
-y 22
-end
-arch ninja_1
-x 28
+arch wall_1_3
+x 30
 y 22
 end
 arch woodfloor
-x 28
-y 23
-end
-arch chair_2.2
-x 28
+x 30
 y 23
 end
 arch woodfloor
-x 28
+x 30
+y 24
+end
+arch chair_2.2
+x 30
 y 24
 end
 arch ninja_1
-x 28
+x 30
 y 24
 end
 arch woodfloor
-x 28
+x 30
+y 25
+end
+arch chair_2.2
+x 30
 y 25
 end
 arch woodfloor
-x 28
+x 30
+y 26
+end
+arch ninja_1
+x 30
 y 26
 end
 arch woodfloor
-x 28
+x 30
 y 27
 end
 arch woodfloor
-x 28
+x 30
 y 28
 end
 arch woodfloor
-x 28
+x 30
 y 29
 end
 arch woodfloor
-x 28
+x 30
 y 30
 end
 arch woodfloor
-x 28
+x 30
 y 31
 end
 arch woodfloor
-x 28
-y 32
-end
-arch wall_2_1_2
-x 28
+x 30
 y 32
 end
 arch woodfloor
-x 29
-end
-arch wall_2_1_2
-x 29
+x 30
+y 33
 end
 arch woodfloor
-x 29
+x 30
+y 34
+end
+arch wall_2_1_2
+x 30
+y 34
+end
+arch cobblestones2
+x 30
+y 35
+end
+arch cobblestones2
+x 30
+y 36
+end
+arch cobblestones2
+x 31
+end
+arch cobblestones2
+x 31
 y 1
 end
 arch woodfloor
-x 29
+x 31
+y 2
+end
+arch wall_2_1_2
+x 31
 y 2
 end
 arch woodfloor
-x 29
+x 31
 y 3
 end
+arch woodfloor
+x 31
+y 4
+end
+arch woodfloor
+x 31
+y 5
+end
 arch conjurer
 name slightly drunken apprentice conjurer
 msg
@@ -6336,41 +7212,41 @@ Are you kidding... My studies consume me entirely...
 I can tell you some Stories...
 endmsg
 hp 90
-x 29
-y 3
+x 31
+y 5
 friendly 1
 end
 arch woodfloor
-x 29
-y 4
-end
-arch woodfloor
-x 29
-y 5
-end
-arch woodfloor
-x 29
+x 31
 y 6
 end
 arch woodfloor
-x 29
+x 31
 y 7
 end
 arch woodfloor
-x 29
+x 31
 y 8
 end
 arch woodfloor
-x 29
+x 31
 y 9
 end
 arch woodfloor
-x 29
+x 31
 y 10
 end
+arch woodfloor
+x 31
+y 11
+end
+arch woodfloor
+x 31
+y 12
+end
 arch chair_1.4
-x 29
-y 10
+x 31
+y 12
 end
 arch c_sage
 name Old man
@@ -6388,583 +7264,634 @@ Professor Emeritus of Empirical History
 @match *
 Can't you see I'm studying?
 endmsg
-x 29
-y 10
+x 31
+y 12
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 29
-y 11
-end
-arch woodfloor
-x 29
-y 12
-end
-arch woodfloor
-x 29
+x 31
 y 13
 end
 arch woodfloor
-x 29
+x 31
 y 14
 end
 arch woodfloor
-x 29
+x 31
 y 15
 end
 arch woodfloor
-x 29
+x 31
 y 16
 end
 arch woodfloor
-x 29
+x 31
 y 17
 end
 arch woodfloor
-x 29
+x 31
 y 18
 end
 arch woodfloor
-x 29
+x 31
 y 19
 end
 arch woodfloor
-x 29
+x 31
 y 20
 end
+arch woodfloor
+x 31
+y 21
+end
+arch woodfloor
+x 31
+y 22
+end
 arch guard
 msg
 @match *
 Closed GAME, move on
 endmsg
-x 29
-y 20
-end
-arch woodfloor
-x 29
-y 21
-end
-arch woodfloor
-x 29
+x 31
 y 22
 end
 arch woodfloor
-x 29
+x 31
 y 23
 end
 arch woodfloor
-x 29
+x 31
 y 24
 end
 arch woodfloor
-x 29
+x 31
 y 25
 end
 arch woodfloor
-x 29
+x 31
 y 26
 end
 arch woodfloor
-x 29
+x 31
 y 27
 end
+arch woodfloor
+x 31
+y 28
+end
+arch woodfloor
+x 31
+y 29
+end
 arch chair_2.1
-x 29
-y 27
+x 31
+y 29
 end
 arch c_woman
-x 29
-y 27
+x 31
+y 29
 end
 arch woodfloor
-x 29
-y 28
+x 31
+y 30
 end
 arch chair_2.4
-x 29
-y 28
+x 31
+y 30
 end
 arch warrior_1
-x 29
-y 28
-end
-arch woodfloor
-x 29
-y 29
-end
-arch chair_2.4
-x 29
-y 29
-end
-arch warrior_1
-x 29
-y 29
-end
-arch woodfloor
-x 29
+x 31
 y 30
 end
 arch woodfloor
-x 29
+x 31
+y 31
+end
+arch chair_2.4
+x 31
+y 31
+end
+arch warrior_1
+x 31
 y 31
 end
 arch woodfloor
-x 29
+x 31
 y 32
 end
+arch woodfloor
+x 31
+y 33
+end
+arch woodfloor
+x 31
+y 34
+end
 arch window_win2
-x 29
-y 32
+x 31
+y 34
 end
-arch woodfloor
-x 30
+arch cobblestones2
+x 31
+y 35
 end
-arch wall_2_1_2
-x 30
+arch cobblestones2
+x 31
+y 36
 end
-arch woodfloor
-x 30
+arch cobblestones2
+x 32
+end
+arch cobblestones2
+x 32
 y 1
 end
 arch woodfloor
-x 30
+x 32
+y 2
+end
+arch wall_2_1_2
+x 32
 y 2
 end
 arch woodfloor
-x 30
+x 32
 y 3
 end
+arch woodfloor
+x 32
+y 4
+end
+arch woodfloor
+x 32
+y 5
+end
 arch table_3
-x 30
-y 3
-end
-arch woodfloor
-x 30
-y 4
-end
-arch chair_1.3
-x 30
-y 4
-end
-arch woodfloor
-x 30
+x 32
 y 5
 end
 arch woodfloor
-x 30
+x 32
+y 6
+end
+arch chair_1.3
+x 32
 y 6
 end
 arch woodfloor
-x 30
+x 32
 y 7
 end
 arch woodfloor
-x 30
+x 32
 y 8
 end
 arch woodfloor
-x 30
+x 32
 y 9
 end
 arch woodfloor
-x 30
+x 32
 y 10
 end
+arch woodfloor
+x 32
+y 11
+end
+arch woodfloor
+x 32
+y 12
+end
 arch table_3
-x 30
-y 10
-end
-arch woodfloor
-x 30
-y 11
-end
-arch chair_1.3
-x 30
-y 11
-end
-arch woodfloor
-x 30
+x 32
 y 12
 end
 arch woodfloor
-x 30
+x 32
+y 13
+end
+arch chair_1.3
+x 32
 y 13
 end
 arch woodfloor
-x 30
+x 32
 y 14
 end
 arch woodfloor
-x 30
+x 32
 y 15
 end
 arch woodfloor
-x 30
+x 32
 y 16
 end
+arch woodfloor
+x 32
+y 17
+end
+arch woodfloor
+x 32
+y 18
+end
 arch chair_1.1
-x 30
-y 16
-end
-arch woodfloor
-x 30
-y 17
-end
-arch chair_1.4
-x 30
-y 17
-end
-arch woodfloor
-x 30
+x 32
 y 18
 end
 arch woodfloor
-x 30
+x 32
+y 19
+end
+arch chair_1.4
+x 32
 y 19
 end
 arch woodfloor
-x 30
-y 20
-end
-arch guard
-x 30
+x 32
 y 20
 end
 arch woodfloor
-x 30
+x 32
 y 21
 end
 arch woodfloor
-x 30
+x 32
+y 22
+end
+arch guard
+x 32
 y 22
 end
 arch woodfloor
-x 30
+x 32
 y 23
 end
 arch woodfloor
-x 30
+x 32
 y 24
 end
 arch woodfloor
-x 30
+x 32
 y 25
 end
 arch woodfloor
-x 30
+x 32
 y 26
 end
 arch woodfloor
-x 30
+x 32
 y 27
 end
+arch woodfloor
+x 32
+y 28
+end
+arch woodfloor
+x 32
+y 29
+end
 arch chair_2.1
-x 30
-y 27
+x 32
+y 29
 end
 arch c_woman
-x 30
-y 27
+x 32
+y 29
 end
 arch woodfloor
-x 30
-y 28
+x 32
+y 30
 end
 arch table_4
-x 30
-y 28
-end
-arch woodfloor
-x 30
-y 29
-end
-arch chair_2.3
-x 30
-y 29
-end
-arch woodfloor
-x 30
+x 32
 y 30
 end
 arch woodfloor
-x 30
+x 32
+y 31
+end
+arch chair_2.3
+x 32
 y 31
 end
 arch woodfloor
-x 30
-y 32
-end
-arch wall_2_1_2
-x 30
+x 32
 y 32
 end
 arch woodfloor
-x 31
-end
-arch wall_2_1_2
-x 31
+x 32
+y 33
 end
 arch woodfloor
-x 31
+x 32
+y 34
+end
+arch wall_2_1_2
+x 32
+y 34
+end
+arch cobblestones2
+x 32
+y 35
+end
+arch cobblestones2
+x 32
+y 36
+end
+arch cobblestones2
+x 33
+end
+arch cobblestones2
+x 33
 y 1
 end
 arch woodfloor
-x 31
+x 33
+y 2
+end
+arch wall_2_1_2
+x 33
 y 2
 end
 arch woodfloor
-x 31
+x 33
 y 3
 end
 arch woodfloor
-x 31
+x 33
 y 4
 end
 arch woodfloor
-x 31
+x 33
 y 5
 end
 arch woodfloor
-x 31
+x 33
 y 6
 end
 arch woodfloor
-x 31
+x 33
 y 7
 end
 arch woodfloor
-x 31
+x 33
 y 8
 end
 arch woodfloor
-x 31
+x 33
 y 9
 end
 arch woodfloor
-x 31
-y 10
-end
-arch chair_1.2
-x 31
+x 33
 y 10
 end
 arch woodfloor
-x 31
+x 33
 y 11
 end
 arch woodfloor
-x 31
+x 33
+y 12
+end
+arch chair_1.2
+x 33
 y 12
 end
 arch woodfloor
-x 31
+x 33
 y 13
 end
 arch woodfloor
-x 31
+x 33
 y 14
 end
 arch woodfloor
-x 31
+x 33
 y 15
 end
 arch woodfloor
-x 31
-y 16
-end
-arch chair_1.1
-x 31
+x 33
 y 16
 end
 arch woodfloor
-x 31
+x 33
 y 17
 end
+arch woodfloor
+x 33
+y 18
+end
+arch chair_1.1
+x 33
+y 18
+end
+arch woodfloor
+x 33
+y 19
+end
 arch block_door_closed
 face table_3.111
-x 31
-y 17
+x 33
+y 19
 speed 0.500000
 connected 123
 end
 arch woodfloor
-x 31
-y 18
+x 33
+y 20
 end
 arch woodfloor
-x 31
-y 19
+x 33
+y 21
 end
 arch sign
 msg
 POKER ROOM --
 endmsg
-x 31
-y 19
-end
-arch woodfloor
-x 31
-y 20
-end
-arch wall_1_4
-x 31
-y 20
-end
-arch woodfloor
-x 31
+x 33
 y 21
 end
 arch woodfloor
-x 31
+x 33
+y 22
+end
+arch wall_1_4
+x 33
 y 22
 end
 arch woodfloor
-x 31
+x 33
 y 23
 end
 arch woodfloor
-x 31
+x 33
 y 24
 end
 arch woodfloor
-x 31
+x 33
 y 25
 end
 arch woodfloor
-x 31
+x 33
 y 26
 end
 arch woodfloor
-x 31
+x 33
 y 27
 end
+arch woodfloor
+x 33
+y 28
+end
+arch woodfloor
+x 33
+y 29
+end
 arch chair_2.1
-x 31
-y 27
+x 33
+y 29
 end
 arch woodfloor
-x 31
-y 28
+x 33
+y 30
 end
 arch chair_2.2
-x 31
-y 28
+x 33
+y 30
 end
 arch c_woman
-x 31
-y 28
-end
-arch woodfloor
-x 31
-y 29
-end
-arch chair_2.2
-x 31
-y 29
-end
-arch ninja_1
-x 31
-y 29
-end
-arch woodfloor
-x 31
+x 33
 y 30
 end
 arch woodfloor
-x 31
+x 33
+y 31
+end
+arch chair_2.2
+x 33
+y 31
+end
+arch ninja_1
+x 33
 y 31
 end
 arch woodfloor
-x 31
-y 32
-end
-arch wall_2_1_2
-x 31
+x 33
 y 32
 end
 arch woodfloor
-x 32
-end
-arch wall_2_1_2
-x 32
+x 33
+y 33
 end
 arch woodfloor
-x 32
+x 33
+y 34
+end
+arch wall_2_1_2
+x 33
+y 34
+end
+arch cobblestones2
+x 33
+y 35
+end
+arch cobblestones2
+x 33
+y 36
+end
+arch cobblestones2
+x 34
+end
+arch cobblestones2
+x 34
 y 1
 end
+arch woodfloor
+x 34
+y 2
+end
+arch wall_2_1_2
+x 34
+y 2
+end
+arch woodfloor
+x 34
+y 3
+end
 arch stair_3_up
 name Stairs going up
 slaying goths2
 hp 31
 sp 1
-x 32
-y 1
-end
-arch woodfloor
-x 32
-y 2
-end
-arch woodfloor
-x 32
+x 34
 y 3
 end
 arch woodfloor
-x 32
+x 34
 y 4
 end
 arch woodfloor
-x 32
+x 34
 y 5
 end
 arch woodfloor
-x 32
+x 34
 y 6
 end
 arch woodfloor
-x 32
+x 34
 y 7
 end
 arch woodfloor
-x 32
+x 34
 y 8
 end
 arch woodfloor
-x 32
+x 34
 y 9
 end
 arch woodfloor
-x 32
+x 34
 y 10
 end
 arch woodfloor
-x 32
+x 34
 y 11
 end
 arch woodfloor
-x 32
+x 34
 y 12
 end
 arch woodfloor
-x 32
+x 34
 y 13
 end
 arch woodfloor
-x 32
+x 34
 y 14
 end
 arch woodfloor
-x 32
+x 34
 y 15
 end
 arch woodfloor
-x 32
+x 34
 y 16
 end
 arch woodfloor
-x 32
+x 34
 y 17
 end
+arch woodfloor
+x 34
+y 18
+end
+arch woodfloor
+x 34
+y 19
+end
 arch faerie_dragon
 name Dragon Emissary
 msg
@@ -6997,8 +7924,8 @@ Drop them right above me and I shall reveal the location of the weapon's hiding
 endmsg
 hp 900
 maxhp 900
-x 32
-y 17
+x 34
+y 19
 friendly 1
 unaggressive 0
 arch event_say
@@ -7008,332 +7935,651 @@ slaying /python/dialog/npc_dialog.py
 end
 end
 arch woodfloor
-x 32
-y 18
-end
-arch woodfloor
-x 32
-y 19
-end
-arch woodfloor
-x 32
-y 20
-end
-arch wall_2_1_2
-x 32
+x 34
 y 20
 end
 arch woodfloor
-x 32
+x 34
 y 21
 end
 arch woodfloor
-x 32
+x 34
+y 22
+end
+arch wall_2_1_2
+x 34
 y 22
 end
 arch woodfloor
-x 32
+x 34
 y 23
 end
 arch woodfloor
-x 32
+x 34
 y 24
 end
 arch woodfloor
-x 32
+x 34
 y 25
 end
 arch woodfloor
-x 32
+x 34
 y 26
 end
 arch woodfloor
-x 32
+x 34
 y 27
 end
 arch woodfloor
-x 32
+x 34
 y 28
 end
 arch woodfloor
-x 32
+x 34
 y 29
 end
 arch woodfloor
-x 32
+x 34
 y 30
 end
 arch woodfloor
-x 32
+x 34
 y 31
 end
 arch woodfloor
-x 32
-y 32
-end
-arch wall_2_1_2
-x 32
+x 34
 y 32
 end
 arch woodfloor
-x 33
+x 34
+y 33
+end
+arch woodfloor
+x 34
+y 34
+end
+arch wall_2_1_2
+x 34
+y 34
+end
+arch cobblestones2
+x 34
+y 35
+end
+arch cobblestones2
+x 34
+y 36
+end
+arch cobblestones2
+x 35
+end
+arch cobblestones2
+x 35
+y 1
+end
+arch woodfloor
+x 35
+y 2
 end
 arch wall_2_2_3
-x 33
-end
-arch woodfloor
-x 33
-y 1
-end
-arch wall_2_1_1
-x 33
-y 1
-end
-arch woodfloor
-x 33
-y 2
-end
-arch wall_2_1_1
-x 33
+x 35
 y 2
 end
 arch woodfloor
-x 33
+x 35
 y 3
 end
 arch wall_2_1_1
-x 33
+x 35
 y 3
 end
 arch woodfloor
-x 33
+x 35
 y 4
 end
 arch wall_2_1_1
-x 33
+x 35
 y 4
 end
 arch woodfloor
-x 33
+x 35
 y 5
 end
 arch wall_2_1_1
-x 33
+x 35
 y 5
 end
 arch woodfloor
-x 33
+x 35
 y 6
 end
 arch wall_2_1_1
-x 33
+x 35
 y 6
 end
 arch woodfloor
-x 33
+x 35
 y 7
 end
 arch wall_2_1_1
-x 33
+x 35
 y 7
 end
 arch woodfloor
-x 33
+x 35
 y 8
 end
 arch wall_2_1_1
-x 33
+x 35
 y 8
 end
 arch woodfloor
-x 33
+x 35
 y 9
 end
 arch wall_2_1_1
-x 33
+x 35
 y 9
 end
 arch woodfloor
-x 33
+x 35
 y 10
 end
 arch wall_2_1_1
-x 33
+x 35
 y 10
 end
 arch woodfloor
-x 33
+x 35
 y 11
 end
 arch wall_2_1_1
-x 33
+x 35
 y 11
 end
 arch woodfloor
-x 33
+x 35
 y 12
 end
 arch wall_2_1_1
-x 33
+x 35
 y 12
 end
 arch woodfloor
-x 33
+x 35
 y 13
 end
 arch wall_2_1_1
-x 33
+x 35
 y 13
 end
 arch woodfloor
-x 33
+x 35
 y 14
 end
 arch wall_2_1_1
-x 33
+x 35
 y 14
 end
 arch woodfloor
-x 33
+x 35
 y 15
 end
 arch wall_2_1_1
-x 33
+x 35
 y 15
 end
 arch woodfloor
-x 33
+x 35
 y 16
 end
 arch wall_2_1_1
-x 33
+x 35
 y 16
 end
 arch woodfloor
-x 33
+x 35
 y 17
 end
 arch wall_2_1_1
-x 33
+x 35
 y 17
 end
 arch woodfloor
-x 33
+x 35
 y 18
 end
 arch wall_2_1_1
-x 33
+x 35
 y 18
 end
 arch woodfloor
-x 33
+x 35
 y 19
 end
 arch wall_2_1_1
-x 33
+x 35
 y 19
 end
 arch woodfloor
-x 33
+x 35
 y 20
 end
+arch wall_2_1_1
+x 35
+y 20
+end
+arch woodfloor
+x 35
+y 21
+end
+arch wall_2_1_1
+x 35
+y 21
+end
+arch woodfloor
+x 35
+y 22
+end
 arch wall_3_4
-x 33
-y 20
-end
-arch woodfloor
-x 33
-y 21
-end
-arch wall_2_1_1
-x 33
-y 21
-end
-arch woodfloor
-x 33
-y 22
-end
-arch wall_2_1_1
-x 33
+x 35
 y 22
 end
 arch woodfloor
-x 33
+x 35
 y 23
 end
 arch wall_2_1_1
-x 33
+x 35
 y 23
 end
 arch woodfloor
-x 33
+x 35
 y 24
 end
 arch wall_2_1_1
-x 33
+x 35
 y 24
 end
 arch woodfloor
-x 33
+x 35
 y 25
 end
 arch wall_2_1_1
-x 33
+x 35
 y 25
 end
 arch woodfloor
-x 33
+x 35
 y 26
 end
 arch wall_2_1_1
-x 33
+x 35
 y 26
 end
 arch woodfloor
-x 33
+x 35
 y 27
 end
 arch wall_2_1_1
-x 33
+x 35
 y 27
 end
 arch woodfloor
-x 33
+x 35
 y 28
 end
 arch wall_2_1_1
-x 33
+x 35
 y 28
 end
 arch woodfloor
-x 33
+x 35
 y 29
 end
 arch wall_2_1_1
-x 33
+x 35
 y 29
 end
 arch woodfloor
-x 33
+x 35
 y 30
 end
 arch wall_2_1_1
-x 33
+x 35
 y 30
 end
 arch woodfloor
-x 33
+x 35
 y 31
 end
 arch wall_2_1_1
-x 33
+x 35
 y 31
 end
 arch woodfloor
-x 33
+x 35
 y 32
 end
+arch wall_2_1_1
+x 35
+y 32
+end
+arch woodfloor
+x 35
+y 33
+end
+arch wall_2_1_1
+x 35
+y 33
+end
+arch woodfloor
+x 35
+y 34
+end
 arch wall_2_2_4
-x 33
+x 35
+y 34
+end
+arch cobblestones2
+x 35
+y 35
+end
+arch cobblestones2
+x 35
+y 36
+end
+arch cobblestones2
+x 36
+end
+arch cobblestones2
+x 36
+y 1
+end
+arch cobblestones2
+x 36
+y 2
+end
+arch cobblestones2
+x 36
+y 3
+end
+arch cobblestones2
+x 36
+y 4
+end
+arch cobblestones2
+x 36
+y 5
+end
+arch cobblestones2
+x 36
+y 6
+end
+arch cobblestones2
+x 36
+y 7
+end
+arch cobblestones2
+x 36
+y 8
+end
+arch cobblestones2
+x 36
+y 9
+end
+arch cobblestones2
+x 36
+y 10
+end
+arch cobblestones2
+x 36
+y 11
+end
+arch cobblestones2
+x 36
+y 12
+end
+arch cobblestones2
+x 36
+y 13
+end
+arch cobblestones2
+x 36
+y 14
+end
+arch cobblestones2
+x 36
+y 15
+end
+arch cobblestones2
+x 36
+y 16
+end
+arch cobblestones2
+x 36
+y 17
+end
+arch cobblestones2
+x 36
+y 18
+end
+arch cobblestones2
+x 36
+y 19
+end
+arch cobblestones2
+x 36
+y 20
+end
+arch cobblestones2
+x 36
+y 21
+end
+arch cobblestones2
+x 36
+y 22
+end
+arch cobblestones2
+x 36
+y 23
+end
+arch cobblestones2
+x 36
+y 24
+end
+arch cobblestones2
+x 36
+y 25
+end
+arch cobblestones2
+x 36
+y 26
+end
+arch cobblestones2
+x 36
+y 27
+end
+arch cobblestones2
+x 36
+y 28
+end
+arch cobblestones2
+x 36
+y 29
+end
+arch cobblestones2
+x 36
+y 30
+end
+arch cobblestones2
+x 36
+y 31
+end
+arch cobblestones2
+x 36
 y 32
 end
+arch cobblestones2
+x 36
+y 33
+end
+arch cobblestones2
+x 36
+y 34
+end
+arch cobblestones2
+x 36
+y 35
+end
+arch cobblestones2
+x 36
+y 36
+end
+arch cobblestones2
+x 37
+end
+arch cobblestones2
+x 37
+y 1
+end
+arch cobblestones2
+x 37
+y 2
+end
+arch cobblestones2
+x 37
+y 3
+end
+arch cobblestones2
+x 37
+y 4
+end
+arch cobblestones2
+x 37
+y 5
+end
+arch cobblestones2
+x 37
+y 6
+end
+arch cobblestones2
+x 37
+y 7
+end
+arch cobblestones2
+x 37
+y 8
+end
+arch cobblestones2
+x 37
+y 9
+end
+arch cobblestones2
+x 37
+y 10
+end
+arch cobblestones2
+x 37
+y 11
+end
+arch cobblestones2
+x 37
+y 12
+end
+arch cobblestones2
+x 37
+y 13
+end
+arch cobblestones2
+x 37
+y 14
+end
+arch cobblestones2
+x 37
+y 15
+end
+arch cobblestones2
+x 37
+y 16
+end
+arch cobblestones2
+x 37
+y 17
+end
+arch cobblestones2
+x 37
+y 18
+end
+arch cobblestones2
+x 37
+y 19
+end
+arch cobblestones2
+x 37
+y 20
+end
+arch cobblestones2
+x 37
+y 21
+end
+arch cobblestones2
+x 37
+y 22
+end
+arch cobblestones2
+x 37
+y 23
+end
+arch cobblestones2
+x 37
+y 24
+end
+arch cobblestones2
+x 37
+y 25
+end
+arch cobblestones2
+x 37
+y 26
+end
+arch cobblestones2
+x 37
+y 27
+end
+arch cobblestones2
+x 37
+y 28
+end
+arch cobblestones2
+x 37
+y 29
+end
+arch cobblestones2
+x 37
+y 30
+end
+arch cobblestones2
+x 37
+y 31
+end
+arch cobblestones2
+x 37
+y 32
+end
+arch cobblestones2
+x 37
+y 33
+end
+arch cobblestones2
+x 37
+y 34
+end
+arch cobblestones2
+x 37
+y 35
+end
+arch cobblestones2
+x 37
+y 36
+end
diff --git a/scorn/taverns/goths0 b/scorn/taverns/goths0
index 6528eddcf..ebf78ad90 100644
--- a/scorn/taverns/goths0
+++ b/scorn/taverns/goths0
@@ -7,7 +7,7 @@ height 40
 enter_x 4
 enter_y 1
 msg
-Modified: 2008-10-23 Rick Tanner
+Modified: 2011-09-12 Rick Tanner
 endmsg
 end
 arch dungeon_floor
@@ -1049,8 +1049,8 @@ y 1
 end
 arch stair_up
 slaying goths
-hp 2
-sp 1
+hp 4
+sp 3
 x 4
 y 1
 end
diff --git a/scorn/taverns/goths2 b/scorn/taverns/goths2
index f8cb60d9f..4dc40a768 100644
--- a/scorn/taverns/goths2
+++ b/scorn/taverns/goths2
@@ -7,7 +7,7 @@ height 30
 enter_x 31
 enter_y 1
 msg
-Modified: 2010-03-30 Cavesomething
+Modified: 2011-09-12 Rick Tanner
 endmsg
 maplore
 The nightman down the hall spots you and
@@ -6056,8 +6056,8 @@ y 1
 end
 arch stair_3_down
 slaying goths
-hp 32
-sp 1
+hp 34
+sp 3
 x 31
 y 1
 end
diff --git a/world/world_105_115 b/world/world_105_115
index 8297a06af..f656331d2 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -8692,8 +8692,8 @@ end
 arch l_shop1
 name Goth's Tavern
 slaying /scorn/taverns/goths
-hp 3
-sp 30
+hp 5
+sp 32
 x 19
 y 34
 end