From 951d0fde5fd53e54cdeacafbf4356536a04d4dc1 Mon Sep 17 00:00:00 2001
From: partmedia <partmedia@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Wed, 7 Aug 2013 02:05:26 +0000
Subject: [PATCH] Revamp Brest Inn.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18894 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 brest/brest.inn     | 3990 +++++++++++++++++++------------------------
 world/world_107_123 |   20 +-
 2 files changed, 1795 insertions(+), 2215 deletions(-)

diff --git a/brest/brest.inn b/brest/brest.inn
index 845f4342e..5934228e7 100644
--- a/brest/brest.inn
+++ b/brest/brest.inn
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 23
 msg
 Created:  1994-09-24 Gene Alexander
-Modified: 2012-01-25 Rick Tanner
+Modified: 2013-08-06 Kevin Zheng
 endmsg
 end
 arch brush
@@ -221,361 +221,357 @@ arch brush
 x 2
 y 1
 end
-arch brush
-x 2
-y 2
-end
-arch brush
-x 2
-y 3
-end
-arch ytree_2
-x 2
-y 3
-end
-arch brush
-x 2
-y 4
-end
-arch brush
-x 2
-y 5
-end
-arch ytree_2
-x 2
-y 5
-end
-arch brush
-x 2
-y 6
-end
-arch brush
-x 2
-y 7
-end
-arch ytree_2
-x 2
-y 7
-end
-arch brush
-x 2
-y 8
-end
-arch brush
-x 2
-y 9
-end
-arch brush
-x 2
-y 10
-end
-arch brush
-x 2
-y 11
-end
 arch woodfloor
 x 2
-y 12
-end
-arch wall_2_2_2
-x 2
-y 12
-end
-arch woodfloor
-x 2
-y 13
-end
-arch swall_1_1_half
-x 2
-y 13
-end
-arch wall_1_2
-x 2
-y 13
-end
-arch dungeon_magic
-x 2
-y 14
-end
-arch woodfloor
-x 2
-y 14
-end
-arch swall_2_1_1
-x 2
-y 14
-end
-arch woodfloor
-x 2
-y 15
-end
-arch swall_1_2_half
-x 2
-y 15
-end
-arch wall_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_2_1
-x 2
-y 17
-end
-arch swall_1_1_half
-x 2
-y 17
-end
-arch dungeon_magic
-x 2
-y 18
-end
-arch woodfloor
-x 2
-y 18
-end
-arch swall_2_1_1
-x 2
-y 18
-end
-arch woodfloor
-x 2
-y 19
-end
-arch swall_1_2_half
-x 2
-y 19
-end
-arch wall_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_2_1
-x 2
-y 21
-end
-arch grass
-x 2
-y 22
-end
-arch flagstone
-x 2
-y 23
-end
-arch flagstone
-x 2
-y 24
-end
-arch brush
-x 3
-end
-arch brush
-x 3
-y 1
-end
-arch woodfloor
-x 3
 y 2
 end
 arch wall_2_2_2
-x 3
+x 2
 y 2
 end
 arch woodfloor
-x 3
+x 2
 y 3
 end
-arch swall_1_1_half
-x 3
-y 3
-end
-arch wall_1_2
-x 3
-y 3
-end
-arch dungeon_magic
-x 3
-y 4
-end
-arch woodfloor
-x 3
-y 4
-end
-arch swall_2_1_1
-x 3
-y 4
-end
-arch woodfloor
-x 3
-y 5
-end
-arch swall_1_2_half
-x 3
-y 5
-end
-arch wall_1_1
-x 3
-y 5
-end
-arch woodfloor
-x 3
-y 6
-end
 arch wall_2_1_1
-x 3
-y 6
+x 2
+y 3
 end
 arch woodfloor
-x 3
-y 7
+x 2
+y 4
+end
+arch window_win1
+x 2
+y 4
+end
+arch woodfloor
+x 2
+y 5
 end
 arch wall_3_2
-x 3
+x 2
+y 5
+end
+arch woodfloor
+x 2
+y 6
+end
+arch window_win1
+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 3
+x 2
 y 8
 end
-arch swall_1_1_half
-x 3
+arch wall_3_2
+x 2
 y 8
 end
-arch wall_1_2
-x 3
-y 8
+arch woodfloor
+x 2
+y 9
 end
-arch dungeon_magic
-x 3
+arch window_win1
+x 2
 y 9
 end
 arch woodfloor
-x 3
-y 9
-end
-arch swall_2_1_1
-x 3
-y 9
-end
-arch woodfloor
-x 3
+x 2
 y 10
 end
-arch swall_1_2_half
-x 3
-y 10
-end
-arch wall_1_1
-x 3
-y 10
-end
-arch woodfloor
-x 3
-y 11
-end
 arch wall_2_1_1
-x 3
+x 2
+y 10
+end
+arch woodfloor
+x 2
+y 11
+end
+arch wall_3_2
+x 2
 y 11
 end
 arch woodfloor
-x 3
+x 2
 y 12
 end
-arch wall_3_1
-x 3
+arch wall_2_1_1
+x 2
 y 12
 end
-arch magic_banned
-x 3
-y 13
-end
 arch woodfloor
-x 3
+x 2
 y 13
 end
-arch bed_save
-x 3
+arch window_win1
+x 2
 y 13
 end
-arch magic_banned
-x 3
+arch dungeon_magic
+x 2
 y 14
 end
 arch woodfloor
-x 3
+x 2
 y 14
 end
-arch magic_banned
-x 3
+arch wall_2_1_1
+x 2
+y 14
+end
+arch woodfloor
+x 2
+y 15
+end
+arch wall_3_2
+x 2
 y 15
 end
 arch woodfloor
-x 3
-y 15
+x 2
+y 16
 end
-arch magic_banned
-x 3
+arch wall_2_1_1
+x 2
 y 16
 end
 arch woodfloor
-x 3
-y 16
-end
-arch chair_2.4
-x 3
-y 16
-end
-arch woodfloor
-x 3
+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 window_win1
+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_2_1
+x 2
+y 21
+end
+arch grass
+x 2
+y 22
+end
+arch flagstone
+x 2
+y 23
+end
+arch flagstone
+x 2
+y 24
+end
+arch brush
+x 3
+end
+arch brush
+x 3
+y 1
+end
+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 bookshelf
+x 3
+y 3
+no_pick 1
+arch random_reading
+end
+arch random_reading
+end
+arch random_reading
+end
+end
+arch woodfloor
+x 3
+y 4
+end
+arch woodfloor
+x 3
+y 5
+end
+arch wall_2_1_2
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 6
+end
+arch table_4
+x 3
+y 6
+no_pick 1
+end
+arch random_food
+x 3
+y 6
+blessed 1
+end
+arch woodfloor
+x 3
+y 7
+end
+arch table_4
+x 3
+y 7
+no_pick 1
+end
+arch random_food
+x 3
+y 7
+blessed 1
+end
+arch woodfloor
+x 3
+y 8
+end
+arch wall_2_1_2
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch table
+x 3
+y 9
+no_pick 1
+end
+arch woodfloor
+x 3
+y 10
+end
+arch chair_1.3
+x 3
+y 10
+no_pick 1
+end
+arch woodfloor
+x 3
+y 11
+end
+arch wall_2_1_2
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
+end
+arch table
+x 3
+y 12
+no_pick 1
+end
+arch woodfloor
+x 3
+y 13
+end
+arch chair_1.3
+x 3
+y 13
+no_pick 1
+end
+arch woodfloor
+x 3
+y 14
+end
+arch woodfloor
+x 3
+y 15
+end
+arch wall_1_3
+x 3
+y 15
+end
+arch altar
+slaying money
+food 250
+x 3
+y 16
+invisible 1
+connected 14
+end
+arch magic_mouth
+msg
+Economy Room (5 platinum)
+endmsg
+x 3
+y 16
+end
+arch woodfloor
+x 3
+y 16
+end
+arch woodfloor
+x 3
 y 17
 end
-arch magic_banned
+arch igate_closed_1
 x 3
-y 18
+y 17
+connected 14
 end
 arch woodfloor
 x 3
 y 18
 end
-arch magic_banned
+arch button_lever
 x 3
-y 19
+y 18
+connected 14
 end
 arch woodfloor
 x 3
 y 19
 end
-arch magic_banned
-x 3
-y 20
-end
 arch woodfloor
 x 3
 y 20
@@ -588,11 +584,7 @@ arch woodfloor
 x 3
 y 21
 end
-arch swall_1_4_half
-x 3
-y 21
-end
-arch wall_1_3
+arch wall_2_1_2
 x 3
 y 21
 end
@@ -623,14 +615,10 @@ arch woodfloor
 x 4
 y 2
 end
-arch wall_2_1_2
+arch window_win2
 x 4
 y 2
 end
-arch magic_banned
-x 4
-y 3
-end
 arch woodfloor
 x 4
 y 3
@@ -639,390 +627,314 @@ arch bed_save
 x 4
 y 3
 end
-arch magic_banned
-x 4
-y 4
-end
 arch woodfloor
 x 4
 y 4
 end
-arch magic_banned
-x 4
-y 5
-end
 arch woodfloor
 x 4
 y 5
 end
-arch magic_banned
-x 4
-y 6
-end
-arch woodfloor
-x 4
-y 6
-end
-arch chair_2.4
-x 4
-y 6
-end
-arch woodfloor
-x 4
-y 7
-end
-arch wall_2_1_2
-x 4
-y 7
-end
-arch magic_banned
-x 4
-y 8
-end
-arch woodfloor
-x 4
-y 8
-end
-arch bed_save
-x 4
-y 8
-end
-arch magic_banned
-x 4
-y 9
-end
-arch woodfloor
-x 4
-y 9
-end
-arch magic_banned
-x 4
-y 10
-end
-arch woodfloor
-x 4
-y 10
-end
-arch magic_banned
-x 4
-y 11
-end
-arch woodfloor
-x 4
-y 11
-end
-arch chair_2.4
-x 4
-y 11
-end
-arch woodfloor
-x 4
-y 12
-end
-arch wall_2_1_2
-x 4
-y 12
-end
-arch magic_banned
-x 4
-y 13
-end
-arch woodfloor
-x 4
-y 13
-end
-arch magic_banned
-x 4
-y 14
-end
-arch woodfloor
-x 4
-y 14
-end
-arch magic_banned
-x 4
-y 15
-end
-arch woodfloor
-x 4
-y 15
-end
-arch magic_banned
-x 4
-y 16
-end
-arch woodfloor
-x 4
-y 16
-end
-arch table_3
-x 4
-y 16
-end
-arch random_food
-x 4
-y 16
-blessed 1
-end
-arch woodfloor
-x 4
-y 17
-end
-arch wall_2_1_2
-x 4
-y 17
-end
-arch magic_banned
-x 4
-y 18
-end
-arch woodfloor
-x 4
-y 18
-end
-arch magic_banned
-x 4
-y 19
-end
-arch woodfloor
-x 4
-y 19
-end
-arch magic_banned
-x 4
-y 20
-end
-arch woodfloor
-x 4
-y 20
-end
-arch dungeon_magic
-x 4
-y 21
-end
-arch woodfloor
-x 4
-y 21
-end
-arch swall_2_1_2
-x 4
-y 21
-end
-arch grass
-x 4
-y 22
-end
-arch ytree
-x 4
-y 22
-end
-arch flagstone
-x 4
-y 23
-end
-arch flagstone
-x 4
-y 24
-end
-arch brush
-x 5
-end
-arch brush
-x 5
-y 1
-end
-arch woodfloor
-x 5
-y 2
-end
-arch swall_1_4_half
-x 5
-y 2
-end
 arch wall_1_3
-x 5
-y 2
-end
-arch magic_banned
-x 5
-y 3
-end
-arch woodfloor
-x 5
-y 3
-end
-arch magic_banned
-x 5
-y 4
-end
-arch woodfloor
-x 5
-y 4
-end
-arch magic_banned
-x 5
+x 4
 y 5
 end
 arch woodfloor
-x 5
-y 5
-end
-arch magic_banned
-x 5
+x 4
 y 6
 end
+arch chair_2.2
+x 4
+y 6
+no_pick 1
+end
 arch woodfloor
-x 5
-y 6
-end
-arch table_3
-x 5
-y 6
-end
-arch random_food
-x 5
-y 6
-blessed 1
-end
-arch woodfloor
-x 5
+x 4
 y 7
 end
+arch chair_2.2
+x 4
+y 7
+no_pick 1
+end
+arch woodfloor
+x 4
+y 8
+end
 arch wall_2_1_2
-x 5
-y 7
-end
-arch magic_banned
-x 5
+x 4
 y 8
 end
 arch woodfloor
-x 5
-y 8
+x 4
+y 9
 end
-arch magic_banned
-x 5
+arch bed_save
+x 4
 y 9
 end
 arch woodfloor
-x 5
-y 9
-end
-arch magic_banned
-x 5
+x 4
 y 10
 end
 arch woodfloor
-x 5
-y 10
-end
-arch magic_banned
-x 5
+x 4
 y 11
 end
-arch woodfloor
-x 5
-y 11
-end
-arch table_3
-x 5
-y 11
-end
-arch random_food
-x 5
-y 11
-blessed 1
-end
-arch woodfloor
-x 5
-y 12
-end
 arch wall_2_1_2
-x 5
+x 4
+y 11
+end
+arch woodfloor
+x 4
 y 12
 end
-arch magic_banned
-x 5
+arch bed_save
+x 4
+y 12
+end
+arch woodfloor
+x 4
 y 13
 end
 arch woodfloor
-x 5
-y 13
+x 4
+y 14
 end
 arch button_lever
-x 5
-y 13
-connected 2
-end
-arch magic_banned
-x 5
+x 4
 y 14
+connected 13
 end
 arch woodfloor
-x 5
-y 14
-end
-arch woodfloor
-x 5
+x 4
 y 15
 end
-arch wall_2_2_2
-x 5
+arch igate_closed_1
+x 4
 y 15
+connected 13
 end
-arch woodfloor
-x 5
+arch altar
+slaying money
+food 250
+x 4
 y 16
+invisible 1
+connected 13
 end
-arch wall_2_1_1
-x 5
+arch magic_mouth
+msg
+Economy Room (5 platinum)
+endmsg
+x 4
 y 16
 end
 arch woodfloor
-x 5
+x 4
+y 16
+end
+arch woodfloor
+x 4
 y 17
 end
-arch wall_2_2_4
-x 5
-y 17
-end
-arch magic_banned
-x 5
-y 18
-end
-arch woodfloor
-x 5
-y 18
-end
-arch magic_banned
-x 5
-y 19
-end
-arch woodfloor
-x 5
-y 19
-end
-arch magic_banned
-x 5
-y 20
-end
-arch woodfloor
-x 5
-y 20
-end
-arch chair_2.4
-x 5
-y 20
-end
-arch woodfloor
-x 5
-y 21
-end
-arch swall_1_3_half
-x 5
-y 21
-end
 arch wall_1_4
+x 4
+y 17
+end
+arch woodfloor
+x 4
+y 18
+end
+arch woodfloor
+x 4
+y 19
+end
+arch chair_1.1
+x 4
+y 19
+no_pick 1
+end
+arch woodfloor
+x 4
+y 20
+end
+arch table
+x 4
+y 20
+no_pick 1
+end
+arch woodfloor
+x 4
+y 21
+end
+arch window_win2
+x 4
+y 21
+end
+arch grass
+x 4
+y 22
+end
+arch ytree
+x 4
+y 22
+end
+arch flagstone
+x 4
+y 23
+end
+arch flagstone
+x 4
+y 24
+end
+arch brush
+x 5
+end
+arch brush
+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 desk
+x 5
+y 3
+no_pick 1
+end
+arch woodfloor
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch wall_2_1_2
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch table
+x 5
+y 9
+no_pick 1
+end
+arch woodfloor
+x 5
+y 10
+end
+arch chair_1.3
+x 5
+y 10
+no_pick 1
+end
+arch woodfloor
+x 5
+y 11
+end
+arch wall_3_3
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
+arch wall_2_1_1
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
+arch wall_2_1_1
+x 5
+y 13
+end
+arch woodfloor
+x 5
+y 14
+end
+arch wall_2_1_1
+x 5
+y 14
+end
+arch woodfloor
+x 5
+y 15
+end
+arch wall_2_2_1
+x 5
+y 15
+end
+arch woodfloor
+x 5
+y 16
+end
+arch woodfloor
+x 5
+y 17
+end
+arch wall_2_2_3
+x 5
+y 17
+end
+arch woodfloor
+x 5
+y 18
+end
+arch wall_2_1_1
+x 5
+y 18
+end
+arch woodfloor
+x 5
+y 19
+end
+arch wall_2_1_1
+x 5
+y 19
+end
+arch woodfloor
+x 5
+y 20
+end
+arch wall_2_1_1
+x 5
+y 20
+end
+arch woodfloor
+x 5
+y 21
+end
+arch wall_3_1
 x 5
 y 21
 end
@@ -1053,89 +965,63 @@ arch woodfloor
 x 6
 y 2
 end
-arch swall_2_1_2
+arch window_win2
 x 6
 y 2
 end
-arch magic_banned
+arch woodfloor
+x 6
+y 3
+end
+arch bed_save
 x 6
 y 3
 end
 arch woodfloor
 x 6
-y 3
-end
-arch magic_banned
-x 6
 y 4
 end
 arch woodfloor
 x 6
-y 4
-end
-arch magic_banned
-x 6
-y 5
-end
-arch woodfloor
-x 6
 y 5
 end
-arch magic_banned
+arch wall_1_4
 x 6
-y 6
+y 5
 end
 arch woodfloor
 x 6
 y 6
 end
-arch button_lever
-x 6
-y 6
-connected 4
-end
 arch woodfloor
 x 6
 y 7
 end
+arch woodfloor
+x 6
+y 8
+end
 arch wall_2_1_2
 x 6
-y 7
-end
-arch magic_banned
-x 6
 y 8
 end
 arch woodfloor
 x 6
-y 8
-end
-arch magic_banned
-x 6
-y 9
-end
-arch woodfloor
-x 6
 y 9
 end
-arch magic_banned
+arch bed_save
 x 6
-y 10
+y 9
 end
 arch woodfloor
 x 6
 y 10
 end
-arch button_lever
-x 6
-y 10
-connected 3
-end
-arch magic_banned
+arch woodfloor
 x 6
 y 11
 end
-arch woodfloor
+arch wall_2_1_2
 x 6
 y 11
 end
@@ -1143,56 +1029,43 @@ arch woodfloor
 x 6
 y 12
 end
-arch wall_2_1_2
-x 6
-y 12
-end
-arch wall_1_2
-face wall_1_short.111
+arch table
 x 6
 y 12
+no_pick 1
 end
 arch woodfloor
 x 6
 y 13
 end
-arch igate_closed_2
+arch chair_1.3
 x 6
 y 13
-connected 2
+no_pick 1
 end
 arch woodfloor
 x 6
 y 14
 end
-arch wall_1_1
-x 6
-y 14
-end
 arch woodfloor
 x 6
 y 15
 end
-arch wall_2_2_4
+arch wall_1_3
 x 6
 y 15
 end
 arch altar
-name pay 4 gold coins
 slaying money
-msg
-Enjoy your stay.
-endmsg
-food 40
+food 250
 x 6
 y 16
 invisible 1
-connected 1
+connected 12
 end
 arch magic_mouth
 msg
-You see on the door:
-This room costs 4 gold coins.  Please drop coins to enter.
+Economy Room (5 platinum)
 endmsg
 x 6
 y 16
@@ -1208,11 +1081,7 @@ end
 arch igate_closed_1
 x 6
 y 17
-connected 1
-end
-arch magic_banned
-x 6
-y 18
+connected 12
 end
 arch woodfloor
 x 6
@@ -1221,33 +1090,20 @@ end
 arch button_lever
 x 6
 y 18
-connected 1
-end
-arch magic_banned
-x 6
-y 19
+connected 12
 end
 arch woodfloor
 x 6
 y 19
 end
-arch magic_banned
-x 6
-y 20
-end
 arch woodfloor
 x 6
 y 20
 end
-arch table_3
+arch bed_save
 x 6
 y 20
 end
-arch random_food
-x 6
-y 20
-blessed 1
-end
 arch woodfloor
 x 6
 y 21
@@ -1279,11 +1135,7 @@ arch woodfloor
 x 7
 y 2
 end
-arch swall_1_3_half
-x 7
-y 2
-end
-arch wall_2_2_2
+arch wall_2_1_2
 x 7
 y 2
 end
@@ -1291,23 +1143,20 @@ arch woodfloor
 x 7
 y 3
 end
-arch wall_2_1_1
+arch clock
 x 7
 y 3
+no_pick 1
 end
 arch woodfloor
 x 7
 y 4
 end
-arch wall_2_1_1
-x 7
-y 4
-end
 arch woodfloor
 x 7
 y 5
 end
-arch wall_2_2_1
+arch wall_2_1_2
 x 7
 y 5
 end
@@ -1315,24 +1164,25 @@ arch woodfloor
 x 7
 y 6
 end
-arch igate_closed_2
+arch chest_2
 x 7
 y 6
-connected 4
+no_pick 1
 end
 arch woodfloor
 x 7
 y 7
 end
-arch wall_2_2_3
+arch button_lever
 x 7
 y 7
+connected 16
 end
 arch woodfloor
 x 7
 y 8
 end
-arch wall_2_1_1
+arch wall_2_1_2
 x 7
 y 8
 end
@@ -1340,24 +1190,25 @@ arch woodfloor
 x 7
 y 9
 end
-arch wall_1_2
+arch clock
 x 7
 y 9
+no_pick 1
 end
 arch woodfloor
 x 7
 y 10
 end
-arch igate_closed_2
+arch button_lever
 x 7
 y 10
-connected 3
+connected 15
 end
 arch woodfloor
 x 7
 y 11
 end
-arch wall_1_1
+arch wall_2_1_2
 x 7
 y 11
 end
@@ -1365,30 +1216,10 @@ arch woodfloor
 x 7
 y 12
 end
-arch wall_2_2_4
+arch bed_save
 x 7
 y 12
 end
-arch altar
-name pay 4 gold coins
-slaying money
-msg
-Enjoy your stay.
-endmsg
-food 40
-x 7
-y 13
-invisible 1
-connected 2
-end
-arch magic_mouth
-msg
-You see on the door:
-This room costs 4 gold coins.  Please drop coins to enter.
-endmsg
-x 7
-y 13
-end
 arch woodfloor
 x 7
 y 13
@@ -1397,10 +1228,35 @@ arch woodfloor
 x 7
 y 14
 end
+arch button_lever
+x 7
+y 14
+connected 11
+end
 arch woodfloor
 x 7
 y 15
 end
+arch igate_closed_1
+x 7
+y 15
+connected 11
+end
+arch altar
+slaying money
+food 250
+x 7
+y 16
+invisible 1
+connected 11
+end
+arch magic_mouth
+msg
+Economy Room (5 platinum)
+endmsg
+x 7
+y 16
+end
 arch woodfloor
 x 7
 y 16
@@ -1409,12 +1265,7 @@ arch woodfloor
 x 7
 y 17
 end
-arch wall_2_2_2
-x 7
-y 17
-end
 arch wall_1_4
-face wall_2_short.111
 x 7
 y 17
 end
@@ -1422,31 +1273,29 @@ arch woodfloor
 x 7
 y 18
 end
-arch wall_2_1_1
-x 7
-y 18
-end
 arch woodfloor
 x 7
 y 19
 end
-arch wall_2_1_1
+arch chair_1.1
 x 7
 y 19
+no_pick 1
 end
 arch woodfloor
 x 7
 y 20
 end
-arch wall_2_1_1
+arch table
 x 7
 y 20
+no_pick 1
 end
 arch woodfloor
 x 7
 y 21
 end
-arch wall_3_1
+arch window_win2
 x 7
 y 21
 end
@@ -1473,31 +1322,23 @@ arch woodfloor
 x 8
 y 2
 end
-arch swall_1_4_half
+arch wall_3_3
 x 8
 y 2
 end
-arch wall_1_3
-x 8
-y 2
-end
-arch magic_banned
-x 8
-y 3
-end
 arch woodfloor
 x 8
 y 3
 end
-arch magic_banned
+arch wall_2_1_1
 x 8
-y 4
+y 3
 end
 arch woodfloor
 x 8
 y 4
 end
-arch chair_2.4
+arch wall_2_1_1
 x 8
 y 4
 end
@@ -1505,90 +1346,92 @@ arch woodfloor
 x 8
 y 5
 end
-arch wall_2_1_2
+arch wall_3_4
 x 8
 y 5
 end
-arch altar
-name pay 4 gold coins
-slaying money
-msg
-Enjoy your stay.
-endmsg
-food 40
-x 8
-y 6
-invisible 1
-connected 4
-end
-arch magic_mouth
-msg
-You see on the door:
-This room costs 4 gold coins.  Please drop coins to enter.
-endmsg
-x 8
-y 6
-end
 arch woodfloor
 x 8
 y 6
 end
+arch wall_2_2_1
+x 8
+y 6
+end
 arch woodfloor
 x 8
 y 7
 end
+arch igate_closed_2
+x 8
+y 7
+connected 16
+end
 arch woodfloor
 x 8
 y 8
 end
+arch wall_2_2_3
+x 8
+y 8
+end
 arch woodfloor
 x 8
 y 9
 end
-arch altar
-name pay 5 gold coins
-slaying money
-msg
-Enjoy your stay.
-endmsg
-food 50
+arch wall_1_2
 x 8
-y 10
-invisible 1
-connected 3
-end
-arch magic_mouth
-msg
-You see on the door:
-This room costs 5 gold coins.  Please drop coins to enter.
-endmsg
-x 8
-y 10
+y 9
 end
 arch woodfloor
 x 8
 y 10
 end
+arch igate_closed_2
+x 8
+y 10
+connected 15
+end
 arch woodfloor
 x 8
 y 11
 end
+arch wall_2_2_3
+x 8
+y 11
+end
 arch woodfloor
 x 8
 y 12
 end
+arch wall_2_1_1
+x 8
+y 12
+end
 arch woodfloor
 x 8
 y 13
 end
+arch wall_2_1_1
+x 8
+y 13
+end
 arch woodfloor
 x 8
 y 14
 end
+arch wall_2_1_1
+x 8
+y 14
+end
 arch woodfloor
 x 8
 y 15
 end
+arch wall_1_2
+x 8
+y 15
+end
 arch woodfloor
 x 8
 y 16
@@ -1597,35 +1440,31 @@ arch woodfloor
 x 8
 y 17
 end
-arch wall_1_3
+arch wall_3_3
 x 8
 y 17
 end
-arch magic_banned
+arch woodfloor
+x 8
+y 18
+end
+arch wall_2_1_1
 x 8
 y 18
 end
 arch woodfloor
 x 8
-y 18
+y 19
 end
-arch magic_banned
+arch wall_2_1_1
 x 8
 y 19
 end
 arch woodfloor
 x 8
-y 19
-end
-arch magic_banned
-x 8
 y 20
 end
-arch woodfloor
-x 8
-y 20
-end
-arch bed_save
+arch wall_2_1_1
 x 8
 y 20
 end
@@ -1633,7 +1472,7 @@ arch woodfloor
 x 8
 y 21
 end
-arch wall_2_1_2
+arch wall_3_1
 x 8
 y 21
 end
@@ -1668,40 +1507,31 @@ arch woodfloor
 x 9
 y 2
 end
-arch swall_2_1_2
+arch window_win2
 x 9
 y 2
 end
-arch magic_banned
+arch woodfloor
+x 9
+y 3
+end
+arch bed_save
 x 9
 y 3
 end
 arch woodfloor
 x 9
-y 3
-end
-arch magic_banned
-x 9
 y 4
 end
-arch woodfloor
+arch bed_save
 x 9
 y 4
 end
-arch table_3
-x 9
-y 4
-end
-arch random_food
-x 9
-y 4
-blessed 1
-end
 arch woodfloor
 x 9
 y 5
 end
-arch wall_2_2_3
+arch bed_save
 x 9
 y 5
 end
@@ -1709,10 +1539,25 @@ arch woodfloor
 x 9
 y 6
 end
-arch wall_2_2_1
+arch wall_2_1_2
 x 9
 y 6
 end
+arch altar
+slaying money
+food 2500
+x 9
+y 7
+invisible 1
+connected 16
+end
+arch magic_mouth
+msg
+Master Suite (50 platinum)
+endmsg
+x 9
+y 7
+end
 arch woodfloor
 x 9
 y 7
@@ -1721,332 +1566,305 @@ arch woodfloor
 x 9
 y 8
 end
+arch woodfloor
+x 9
+y 9
+end
+arch altar
+slaying money
+food 500
+x 9
+y 10
+invisible 1
+connected 15
+end
+arch magic_mouth
+msg
+Double Room (10 platinum)
+endmsg
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch woodfloor
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 15
+end
+arch woodfloor
+x 9
+y 16
+end
+arch woodfloor
+x 9
+y 17
+end
+arch wall_1_3
+x 9
+y 17
+end
+arch dungeon_magic
+x 9
+y 18
+end
+arch woodfloor
+x 9
+y 18
+end
+arch bed_save
+x 9
+y 18
+end
+arch dungeon_magic
+x 9
+y 19
+end
+arch woodfloor
+x 9
+y 19
+end
+arch bed_save
+x 9
+y 19
+end
+arch dungeon_magic
+x 9
+y 20
+end
+arch woodfloor
+x 9
+y 20
+end
+arch bed_save
+x 9
+y 20
+end
+arch woodfloor
+x 9
+y 21
+end
+arch wall_2_1_2
+x 9
+y 21
+end
+arch grass
+x 9
+y 22
+end
+arch flagstone
+x 9
+y 23
+end
+arch flagstone
+x 9
+y 24
+end
+arch brush
+x 10
+end
+arch brush
+x 10
+y 1
+end
+arch woodfloor
+x 10
+y 2
+end
+arch wall_2_1_2
+x 10
+y 2
+end
+arch woodfloor
+x 10
+y 3
+end
+arch table
+x 10
+y 3
+no_pick 1
+end
+arch woodfloor
+x 10
+y 4
+end
+arch chair_1.3
+x 10
+y 4
+no_pick 1
+end
+arch woodfloor
+x 10
+y 5
+end
+arch bed_save
+x 10
+y 5
+end
+arch woodfloor
+x 10
+y 6
+end
+arch wall_2_1_2
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
 arch swall_2_2_2
-x 9
+x 10
 y 8
 end
 arch wall_0
-x 9
+x 10
 y 8
 end
 arch woodfloor
-x 9
+x 10
 y 9
 end
 arch swall_2_1_1
-x 9
+x 10
 y 9
 end
 arch woodfloor
-x 9
+x 10
 y 10
 end
 arch swall_2_1_1
-x 9
+x 10
 y 10
 end
 arch woodfloor
-x 9
+x 10
 y 11
 end
 arch swall_2_1_1
-x 9
+x 10
 y 11
 end
 arch woodfloor
-x 9
+x 10
 y 12
 end
 arch swall_2_1_1
-x 9
+x 10
 y 12
 end
 arch woodfloor
-x 9
+x 10
 y 13
 end
 arch swall_2_1_1
-x 9
+x 10
 y 13
 end
 arch woodfloor
-x 9
+x 10
 y 14
 end
 arch swall_2_1_1
-x 9
+x 10
 y 14
 end
 arch woodfloor
-x 9
+x 10
 y 15
 end
 arch swall_2_2_1
-x 9
+x 10
 y 15
 end
 arch wall_0
-x 9
+x 10
 y 15
 end
-arch altar
-name pay 5 gold coins
+arch altar_trigger
 slaying money
 msg
-Enjoy your stay!
+Remember: No spells or alchemy are allowed. If you require these services, please consider buying a more expensive room.
 endmsg
-food 50
-x 9
+x 10
 y 16
-invisible 1
-connected 9
+connected 10
 end
 arch magic_mouth
 msg
-You see on the door:
-This room costs 5 gold coins.  Please drop coins to enter.
+Bargain Bunks (5 silver)
 endmsg
-x 9
+x 10
 y 16
 end
 arch woodfloor
-x 9
+x 10
 y 16
 end
 arch woodfloor
-x 9
-y 17
-end
-arch woodfloor
-x 9
+x 10
 y 17
 end
 arch igate_closed_1
-x 9
-y 17
-connected 9
-end
-arch magic_banned
-x 9
-y 18
-end
-arch woodfloor
-x 9
-y 18
-end
-arch magic_banned
-x 9
-y 18
-end
-arch woodfloor
-x 9
-y 18
-end
-arch button_lever
-x 9
-y 18
-connected 9
-end
-arch magic_banned
-x 9
-y 19
-end
-arch woodfloor
-x 9
-y 19
-end
-arch magic_banned
-x 9
-y 20
-end
-arch woodfloor
-x 9
-y 20
-end
-arch woodfloor
-x 9
-y 21
-end
-arch swall_1_4_half
-x 9
-y 21
-end
-arch wall_1_3
-x 9
-y 21
-end
-arch grass
-x 9
-y 22
-end
-arch flagstone
-x 9
-y 23
-end
-arch flagstone
-x 9
-y 24
-end
-arch brush
-x 10
-end
-arch brush
-x 10
-y 1
-end
-arch woodfloor
-x 10
-y 2
-end
-arch swall_1_3_half
-x 10
-y 2
-end
-arch wall_1_4
-x 10
-y 2
-end
-arch magic_banned
-x 10
-y 3
-end
-arch woodfloor
-x 10
-y 3
-end
-arch bed_save
-x 10
-y 3
-end
-arch magic_banned
-x 10
-y 4
-end
-arch woodfloor
-x 10
-y 4
-end
-arch chair_2.2
-x 10
-y 4
-end
-arch magic_banned
-x 10
-y 5
-end
-arch woodfloor
-x 10
-y 5
-end
-arch woodfloor
-x 10
-y 6
-end
-arch wall_2_1_2
-x 10
-y 6
-end
-arch woodfloor
-x 10
-y 7
-end
-arch woodfloor
-x 10
-y 8
-end
-arch swall_2_1_2
-x 10
-y 8
-end
-arch grass
-x 10
-y 9
-end
-arch statue
-x 10
-y 9
-end
-arch grass
-x 10
-y 10
-end
-arch grass
-x 10
-y 11
-end
-arch grass
-x 10
-y 12
-end
-arch grass
-x 10
-y 13
-end
-arch grass
-x 10
-y 14
-end
-arch statue
-x 10
-y 14
-end
-arch woodfloor
-x 10
-y 15
-end
-arch swall_2_1_2
-x 10
-y 15
-end
-arch woodfloor
-x 10
-y 16
-end
-arch woodfloor
 x 10
 y 17
-end
-arch wall_1_4
-x 10
-y 17
-end
-arch magic_banned
-x 10
-y 18
-end
-arch woodfloor
-x 10
-y 18
-end
-arch magic_banned
-x 10
-y 19
-end
-arch woodfloor
-x 10
-y 19
-end
-arch magic_banned
-x 10
-y 20
-end
-arch woodfloor
-x 10
-y 20
-end
-arch chair_2.4
-x 10
-y 20
+connected 10
 end
 arch dungeon_magic
 x 10
-y 21
+y 18
+end
+arch woodfloor
+x 10
+y 18
+end
+arch trigger
+x 10
+y 18
+connected 10
+end
+arch dungeon_magic
+x 10
+y 19
+end
+arch woodfloor
+x 10
+y 19
+end
+arch dungeon_magic
+x 10
+y 20
+end
+arch woodfloor
+x 10
+y 20
 end
 arch woodfloor
 x 10
 y 21
 end
-arch swall_2_1_2
+arch window_win2
 x 10
 y 21
 end
@@ -2077,26 +1895,19 @@ arch wall_2_1_2
 x 11
 y 2
 end
-arch magic_banned
-x 11
-y 3
-end
 arch woodfloor
 x 11
 y 3
 end
-arch magic_banned
+arch chair_1.2
 x 11
-y 4
+y 3
+no_pick 1
 end
 arch woodfloor
 x 11
 y 4
 end
-arch magic_banned
-x 11
-y 5
-end
 arch woodfloor
 x 11
 y 5
@@ -2125,19 +1936,19 @@ arch grass
 x 11
 y 9
 end
+arch statue
+x 11
+y 9
+end
 arch grass
 x 11
 y 10
 end
-arch sea
-x 11
-y 10
-end
-arch sea
+arch grass
 x 11
 y 11
 end
-arch sea
+arch grass
 x 11
 y 12
 end
@@ -2145,14 +1956,14 @@ arch grass
 x 11
 y 13
 end
-arch sea
-x 11
-y 13
-end
 arch grass
 x 11
 y 14
 end
+arch statue
+x 11
+y 14
+end
 arch woodfloor
 x 11
 y 15
@@ -2174,11 +1985,11 @@ arch woodfloor
 x 11
 y 17
 end
-arch wall_2_1_2
+arch wall_1_4
 x 11
 y 17
 end
-arch magic_banned
+arch dungeon_magic
 x 11
 y 18
 end
@@ -2186,7 +1997,11 @@ arch woodfloor
 x 11
 y 18
 end
-arch magic_banned
+arch bed_save
+x 11
+y 18
+end
+arch dungeon_magic
 x 11
 y 19
 end
@@ -2194,7 +2009,11 @@ arch woodfloor
 x 11
 y 19
 end
-arch magic_banned
+arch bed_save
+x 11
+y 19
+end
+arch dungeon_magic
 x 11
 y 20
 end
@@ -2202,24 +2021,15 @@ arch woodfloor
 x 11
 y 20
 end
-arch table_3
+arch bed_save
 x 11
 y 20
 end
-arch random_food
-x 11
-y 20
-blessed 1
-end
 arch woodfloor
 x 11
 y 21
 end
-arch swall_1_3_half
-x 11
-y 21
-end
-arch wall_1_4
+arch wall_2_1_2
 x 11
 y 21
 end
@@ -2246,34 +2056,23 @@ arch woodfloor
 x 12
 y 2
 end
-arch wall_2_1_2
+arch window_win2
 x 12
 y 2
 end
-arch magic_banned
-x 12
-y 3
-end
 arch woodfloor
 x 12
 y 3
 end
-arch bed_save
+arch clock
 x 12
 y 3
-end
-arch magic_banned
-x 12
-y 4
+no_pick 1
 end
 arch woodfloor
 x 12
 y 4
 end
-arch magic_banned
-x 12
-y 5
-end
 arch woodfloor
 x 12
 y 5
@@ -2281,7 +2080,7 @@ end
 arch button_lever
 x 12
 y 5
-connected 5
+connected 17
 end
 arch woodfloor
 x 12
@@ -2290,24 +2089,19 @@ end
 arch igate_closed_1
 x 12
 y 6
-connected 5
+connected 17
 end
 arch altar
-name pay 7 gold coins
 slaying money
-msg
-Enjoy your stay!
-endmsg
-food 70
+food 1000
 x 12
 y 7
 invisible 1
-connected 5
+connected 17
 end
 arch magic_mouth
 msg
-You see on the door:
-This room costs 7 gold coins.  Please drop coins to enter.
+Group Suite (20 platinum)
 endmsg
 x 12
 y 7
@@ -2328,26 +2122,26 @@ arch grass
 x 12
 y 9
 end
+arch grass
+x 12
+y 10
+end
 arch sea
 x 12
 y 10
 end
-arch firewall_5
-x 12
-y 11
-move_block 0
-blocksview 0
-arch spell_small_fireball
-end
-end
-arch pstone_4
+arch sea
 x 12
 y 11
 end
-arch pstone_4
+arch sea
 x 12
 y 12
 end
+arch grass
+x 12
+y 13
+end
 arch sea
 x 12
 y 13
@@ -2498,13 +2292,9 @@ arch sea
 x 13
 y 10
 end
-arch pstone_4
+arch firewall_5
 x 13
 y 11
-end
-arch firewall_1
-x 13
-y 12
 move_block 0
 blocksview 0
 arch spell_small_fireball
@@ -2512,6 +2302,10 @@ end
 end
 arch pstone_4
 x 13
+y 11
+end
+arch pstone_4
+x 13
 y 12
 end
 arch sea
@@ -2552,9 +2346,9 @@ x 13
 y 18
 end
 arch sign_w
+name Rooms
 msg
-To the bedrooms...
-Don't forget to pay your room before entering.  It's about 5 gold coins per night.
+Most rooms can be used for multiple days without repayment; just don't close the lever behind you!
 endmsg
 x 13
 y 18
@@ -2563,19 +2357,6 @@ arch woodfloor
 x 13
 y 19
 end
-arch man
-msg
-@match *
-Welcome to Brest Inn!
-endmsg
-face man.131
-hp 100
-maxhp 100
-x 13
-y 19
-friendly 1
-unaggressive 0
-end
 arch woodfloor
 x 13
 y 20
@@ -2604,34 +2385,10 @@ arch tree
 x 13
 y 22
 end
-arch dungeon_magic
-x 13
-y 23
-end
-arch exit
-slaying /world/world_107_123
-hp 31
-sp 29
-x 13
-y 23
-invisible 1
-end
 arch flagstone
 x 13
 y 23
 end
-arch dungeon_magic
-x 13
-y 24
-end
-arch exit
-slaying /world/world_107_123
-hp 31
-sp 29
-x 13
-y 24
-invisible 1
-end
 arch flagstone
 x 13
 y 24
@@ -2643,39 +2400,39 @@ arch tree
 x 14
 y 1
 end
+arch dungeon_magic
+x 14
+y 2
+end
 arch woodfloor
 x 14
 y 2
 end
-arch wall_2_1_2
+arch window_win2
 x 14
 y 2
 end
-arch magic_banned
-x 14
-y 3
-end
 arch woodfloor
 x 14
 y 3
 end
-arch chair_2.4
+arch bed_save
 x 14
 y 3
 end
-arch magic_banned
-x 14
-y 4
-end
 arch woodfloor
 x 14
 y 4
 end
-arch magic_banned
+arch bed_save
+x 14
+y 4
+end
+arch woodfloor
 x 14
 y 5
 end
-arch woodfloor
+arch bed_save
 x 14
 y 5
 end
@@ -2707,9 +2464,13 @@ arch sea
 x 14
 y 10
 end
-arch firewall_5
+arch pstone_4
 x 14
 y 11
+end
+arch firewall_1
+x 14
+y 12
 move_block 0
 blocksview 0
 arch spell_small_fireball
@@ -2717,24 +2478,12 @@ end
 end
 arch pstone_4
 x 14
-y 11
-end
-arch pstone_4
-x 14
 y 12
 end
 arch sea
 x 14
 y 13
 end
-arch sea
-x 14
-y 13
-end
-arch grass
-x 14
-y 14
-end
 arch grass
 x 14
 y 14
@@ -2747,34 +2496,14 @@ arch swall_2_1_2
 x 14
 y 15
 end
-arch button_small
-x 14
-y 16
-connected 200
-end
 arch woodfloor
 x 14
 y 16
 end
-arch button_small
-x 14
-y 17
-connected 200
-end
 arch woodfloor
 x 14
 y 17
 end
-arch mdoor_closed_1
-x 14
-y 17
-connected 200
-end
-arch button_small
-x 14
-y 18
-connected 200
-end
 arch woodfloor
 x 14
 y 18
@@ -2806,6 +2535,18 @@ x 14
 y 21
 connected 100
 end
+arch dungeon_magic
+x 14
+y 22
+end
+arch exit
+slaying /world/world_107_123
+hp 31
+sp 29
+x 14
+y 22
+invisible 1
+end
 arch button_small
 x 14
 y 22
@@ -2819,18 +2560,6 @@ arch flagstone
 x 14
 y 23
 end
-arch dungeon_magic
-x 14
-y 24
-end
-arch exit
-slaying /world/world_107_123
-hp 31
-sp 29
-x 14
-y 24
-invisible 1
-end
 arch flagstone
 x 14
 y 24
@@ -2846,44 +2575,33 @@ arch woodfloor
 x 15
 y 2
 end
-arch swall_1_4_half
+arch wall_2_1_2
 x 15
 y 2
 end
-arch wall_1_3
-x 15
-y 2
-end
-arch magic_banned
-x 15
-y 3
-end
 arch woodfloor
 x 15
 y 3
 end
-arch table_3
+arch table
 x 15
 y 3
-end
-arch random_food
-x 15
-y 3
-blessed 1
-end
-arch magic_banned
-x 15
-y 4
+no_pick 1
 end
 arch woodfloor
 x 15
 y 4
 end
-arch magic_banned
+arch chair_1.3
+x 15
+y 4
+no_pick 1
+end
+arch woodfloor
 x 15
 y 5
 end
-arch woodfloor
+arch bed_save
 x 15
 y 5
 end
@@ -2915,11 +2633,19 @@ arch sea
 x 15
 y 10
 end
-arch sea
+arch firewall_5
+x 15
+y 11
+move_block 0
+blocksview 0
+arch spell_small_fireball
+end
+end
+arch pstone_4
 x 15
 y 11
 end
-arch sea
+arch pstone_4
 x 15
 y 12
 end
@@ -2927,6 +2653,14 @@ arch sea
 x 15
 y 13
 end
+arch sea
+x 15
+y 13
+end
+arch grass
+x 15
+y 14
+end
 arch grass
 x 15
 y 14
@@ -2961,9 +2695,7 @@ x 15
 y 18
 end
 arch sign_e
-msg
-To the dining room...
-endmsg
+name Dining
 x 15
 y 18
 end
@@ -2999,34 +2731,10 @@ arch tree
 x 15
 y 22
 end
-arch dungeon_magic
-x 15
-y 23
-end
-arch exit
-slaying /world/world_107_123
-hp 31
-sp 29
-x 15
-y 23
-invisible 1
-end
 arch flagstone
 x 15
 y 23
 end
-arch dungeon_magic
-x 15
-y 24
-end
-arch exit
-slaying /world/world_107_123
-hp 31
-sp 29
-x 15
-y 24
-invisible 1
-end
 arch flagstone
 x 15
 y 24
@@ -3038,42 +2746,27 @@ arch brush
 x 16
 y 1
 end
-arch dungeon_magic
+arch woodfloor
+x 16
+y 2
+end
+arch wall_2_1_2
 x 16
 y 2
 end
 arch woodfloor
 x 16
-y 2
-end
-arch swall_2_1_2
-x 16
-y 2
-end
-arch magic_banned
-x 16
 y 3
 end
-arch woodfloor
+arch chair_1.2
 x 16
 y 3
-end
-arch chair_2.2
-x 16
-y 3
-end
-arch magic_banned
-x 16
-y 4
+no_pick 1
 end
 arch woodfloor
 x 16
 y 4
 end
-arch magic_banned
-x 16
-y 5
-end
 arch woodfloor
 x 16
 y 5
@@ -3082,7 +2775,7 @@ arch woodfloor
 x 16
 y 6
 end
-arch wall_2_1_2
+arch wall_1_3
 x 16
 y 6
 end
@@ -3102,23 +2795,19 @@ arch grass
 x 16
 y 9
 end
-arch statue
-x 16
-y 9
-end
-arch grass
+arch sea
 x 16
 y 10
 end
-arch grass
+arch sea
 x 16
 y 11
 end
-arch grass
+arch sea
 x 16
 y 12
 end
-arch grass
+arch sea
 x 16
 y 13
 end
@@ -3126,10 +2815,6 @@ arch grass
 x 16
 y 14
 end
-arch statue
-x 16
-y 14
-end
 arch woodfloor
 x 16
 y 15
@@ -3143,14 +2828,6 @@ x 16
 y 16
 connected 300
 end
-arch magic_mouth
-msg
-Did you order a table?
-The meal is arround 1 gold coin.
-endmsg
-x 16
-y 16
-end
 arch woodfloor
 x 16
 y 16
@@ -3165,7 +2842,7 @@ arch woodfloor
 x 16
 y 17
 end
-arch wall_2_2_3
+arch wall_2_1_2
 x 16
 y 17
 end
@@ -3173,31 +2850,34 @@ arch woodfloor
 x 16
 y 18
 end
-arch wall_2_1_1
+arch bench_1_1
 x 16
 y 18
+move_block all
 end
 arch woodfloor
 x 16
 y 19
 end
-arch wall_2_1_1
+arch bench_2_1_1
 x 16
 y 19
+move_block all
 end
 arch woodfloor
 x 16
 y 20
 end
-arch wall_2_1_1
+arch bench_2_2_1
 x 16
 y 20
+move_block all
 end
 arch woodfloor
 x 16
 y 21
 end
-arch wall_3_1
+arch wall_2_1_2
 x 16
 y 21
 end
@@ -3224,49 +2904,55 @@ arch woodfloor
 x 17
 y 2
 end
-arch swall_1_3_half
+arch window_win2
 x 17
 y 2
 end
-arch wall_1_4
-x 17
-y 2
-end
-arch magic_banned
-x 17
-y 3
-end
 arch woodfloor
 x 17
 y 3
 end
-arch bed_save
+arch clock
 x 17
 y 3
+no_pick 1
 end
-arch magic_banned
+arch woodfloor
 x 17
 y 4
 end
 arch woodfloor
 x 17
-y 4
-end
-arch magic_banned
-x 17
 y 5
 end
-arch woodfloor
+arch button_lever
 x 17
 y 5
+connected 18
 end
 arch woodfloor
 x 17
 y 6
 end
-arch wall_1_3
+arch igate_closed_1
 x 17
 y 6
+connected 18
+end
+arch altar
+slaying money
+food 1000
+x 17
+y 7
+invisible 1
+connected 18
+end
+arch magic_mouth
+msg
+Group Suite (20 platinum)
+endmsg
+x 17
+y 7
 end
 arch woodfloor
 x 17
@@ -3276,59 +2962,39 @@ arch woodfloor
 x 17
 y 8
 end
-arch swall_2_2_3
+arch swall_2_1_2
 x 17
 y 8
 end
-arch wall_0
-x 17
-y 8
-end
-arch woodfloor
+arch grass
 x 17
 y 9
 end
-arch swall_2_1_1
+arch statue
 x 17
 y 9
 end
-arch woodfloor
+arch grass
 x 17
 y 10
 end
-arch swall_2_1_1
-x 17
-y 10
-end
-arch woodfloor
+arch grass
 x 17
 y 11
 end
-arch swall_2_1_1
-x 17
-y 11
-end
-arch woodfloor
+arch grass
 x 17
 y 12
 end
-arch swall_2_1_1
-x 17
-y 12
-end
-arch woodfloor
+arch grass
 x 17
 y 13
 end
-arch swall_2_1_1
-x 17
-y 13
-end
-arch woodfloor
+arch grass
 x 17
 y 14
 end
-arch swall_2_1_1
+arch statue
 x 17
 y 14
 end
@@ -3336,11 +3002,7 @@ arch woodfloor
 x 17
 y 15
 end
-arch swall_2_2_4
-x 17
-y 15
-end
-arch wall_0
+arch swall_2_1_2
 x 17
 y 15
 end
@@ -3357,10 +3019,33 @@ arch woodfloor
 x 17
 y 17
 end
+arch wall_2_1_2
+x 17
+y 17
+end
 arch woodfloor
 x 17
 y 18
 end
+arch man
+name innkeeper
+msg
+@match room
+Different rooms are available to the left, ranging in price according to your needs.
+@reply expensive But the rooms are so expensive!
+@match expensive
+You can use a room for as long as you wish, just remember not to close the door behind you.
+@match *
+G'day, welcome to the Brest Inn! How can I help you?
+@reply room I'd like a room for the night.
+endmsg
+hp 100
+maxhp 100
+x 17
+y 18
+friendly 1
+unaggressive 0
+end
 arch woodfloor
 x 17
 y 19
@@ -3369,15 +3054,16 @@ arch woodfloor
 x 17
 y 20
 end
+arch bench_1_3
+x 17
+y 20
+move_block all
+end
 arch woodfloor
 x 17
 y 21
 end
-arch swall_1_4_half
-x 17
-y 21
-end
-arch wall_1_3
+arch wall_2_1_2
 x 17
 y 21
 end
@@ -3404,71 +3090,41 @@ arch woodfloor
 x 18
 y 2
 end
-arch wall_2_1_2
+arch wall_3_3
 x 18
 y 2
 end
-arch magic_banned
-x 18
-y 3
-end
 arch woodfloor
 x 18
 y 3
 end
-arch bed_save
+arch wall_2_1_1
 x 18
 y 3
 end
-arch magic_banned
-x 18
-y 4
-end
 arch woodfloor
 x 18
 y 4
 end
-arch magic_banned
+arch wall_2_1_1
 x 18
-y 5
+y 4
 end
 arch woodfloor
 x 18
 y 5
 end
-arch button_lever
+arch wall_2_1_1
 x 18
 y 5
-connected 6
 end
 arch woodfloor
 x 18
 y 6
 end
-arch igate_closed_1
+arch wall_2_2_1
 x 18
 y 6
-connected 6
-end
-arch altar
-name pay 10 gold coins
-slaying money
-msg
-Enjoy your stay!
-endmsg
-food 100
-x 18
-y 7
-invisible 1
-connected 6
-end
-arch magic_mouth
-msg
-You see on the door:
-This room costs 10 gold coins.  Please drop coins to enter.
-endmsg
-x 18
-y 7
 end
 arch woodfloor
 x 18
@@ -3478,7 +3134,11 @@ arch woodfloor
 x 18
 y 8
 end
-arch wall_1_4
+arch swall_2_2_3
+x 18
+y 8
+end
+arch wall_0
 x 18
 y 8
 end
@@ -3486,18 +3146,177 @@ arch woodfloor
 x 18
 y 9
 end
+arch swall_2_1_1
+x 18
+y 9
+end
 arch woodfloor
 x 18
 y 10
 end
+arch swall_2_1_1
+x 18
+y 10
+end
 arch woodfloor
 x 18
 y 11
 end
-arch chair_2.4
+arch swall_2_1_1
 x 18
 y 11
 end
+arch woodfloor
+x 18
+y 12
+end
+arch swall_2_1_1
+x 18
+y 12
+end
+arch woodfloor
+x 18
+y 13
+end
+arch swall_2_1_1
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 14
+end
+arch swall_2_1_1
+x 18
+y 14
+end
+arch woodfloor
+x 18
+y 15
+end
+arch swall_2_2_4
+x 18
+y 15
+end
+arch wall_0
+x 18
+y 15
+end
+arch woodfloor
+x 18
+y 16
+end
+arch woodfloor
+x 18
+y 17
+end
+arch wall_3_3
+x 18
+y 17
+end
+arch woodfloor
+x 18
+y 18
+end
+arch wall_2_1_1
+x 18
+y 18
+end
+arch woodfloor
+x 18
+y 19
+end
+arch wall_2_1_1
+x 18
+y 19
+end
+arch woodfloor
+x 18
+y 20
+end
+arch wall_2_1_1
+x 18
+y 20
+end
+arch dungeon_magic
+x 18
+y 21
+end
+arch woodfloor
+x 18
+y 21
+end
+arch wall_3_1
+x 18
+y 21
+end
+arch grass
+x 18
+y 22
+end
+arch flagstone
+x 18
+y 23
+end
+arch flagstone
+x 18
+y 24
+end
+arch tree
+x 19
+end
+arch brush
+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 woodfloor
+x 19
+y 4
+end
+arch chair_1.4
+x 19
+y 4
+end
+arch woodfloor
+x 19
+y 5
+end
+arch woodfloor
+x 19
+y 6
+end
+arch wall_2_1_2
+x 19
+y 6
+end
+arch woodfloor
+x 19
+y 7
+end
+arch woodfloor
+x 19
+y 8
+end
+arch woodfloor
+x 19
+y 9
+end
+arch chair_1.4
+x 19
+y 9
+end
 arch fighter
 msg
 @match yes|no|palace
@@ -3507,152 +3326,12 @@ There are nine gates in the palace.  They are often referred to as the "Nine Gat
 @reply yes Yes... what about it?
 Did you see the big palace in this city?
 endmsg
-x 18
-y 11
+x 19
+y 9
 friendly 1
 unaggressive 0
 end
 arch woodfloor
-x 18
-y 12
-end
-arch woodfloor
-x 18
-y 13
-end
-arch woodfloor
-x 18
-y 14
-end
-arch chair_2.4
-x 18
-y 14
-end
-arch woodfloor
-x 18
-y 15
-end
-arch woodfloor
-x 18
-y 16
-end
-arch woodfloor
-x 18
-y 17
-end
-arch woodfloor
-x 18
-y 18
-end
-arch woodfloor
-x 18
-y 19
-end
-arch woodfloor
-x 18
-y 20
-end
-arch dungeon_magic
-x 18
-y 21
-end
-arch woodfloor
-x 18
-y 21
-end
-arch swall_2_1_2
-x 18
-y 21
-end
-arch grass
-x 18
-y 22
-end
-arch flagstone
-x 18
-y 23
-end
-arch flagstone
-x 18
-y 24
-end
-arch tree
-x 19
-end
-arch brush
-x 19
-y 1
-end
-arch woodfloor
-x 19
-y 2
-end
-arch wall_3_3
-x 19
-y 2
-end
-arch woodfloor
-x 19
-y 3
-end
-arch wall_2_1_1
-x 19
-y 3
-end
-arch woodfloor
-x 19
-y 4
-end
-arch wall_2_1_1
-x 19
-y 4
-end
-arch woodfloor
-x 19
-y 5
-end
-arch wall_2_1_1
-x 19
-y 5
-end
-arch woodfloor
-x 19
-y 6
-end
-arch wall_2_1_1
-x 19
-y 6
-end
-arch wall_1_4
-face wall_2_short.111
-x 19
-y 6
-end
-arch woodfloor
-x 19
-y 7
-end
-arch wall_2_1_1
-x 19
-y 7
-end
-arch woodfloor
-x 19
-y 8
-end
-arch wall_2_2_4
-x 19
-y 8
-end
-arch woodfloor
-x 19
-y 9
-end
-arch woodfloor
-x 19
-y 10
-end
-arch chair_2.1
 x 19
 y 10
 end
@@ -3660,18 +3339,10 @@ arch woodfloor
 x 19
 y 11
 end
-arch table_4
-x 19
-y 11
-end
 arch woodfloor
 x 19
 y 12
 end
-arch chair_2.3
-x 19
-y 12
-end
 arch woodfloor
 x 19
 y 13
@@ -3680,7 +3351,7 @@ arch woodfloor
 x 19
 y 14
 end
-arch table_4
+arch chair_1.4
 x 19
 y 14
 end
@@ -3696,31 +3367,22 @@ arch woodfloor
 x 19
 y 17
 end
+arch wall_2_1_2
+x 19
+y 17
+end
 arch woodfloor
 x 19
 y 18
 end
-arch altar
-name pay 3 gold coins
-slaying money
-food 30
-x 19
-y 19
-invisible 1
-connected 7
-end
-arch magic_mouth
-msg
-You see on the door:
-This dining room costs 3 gold to reserve.  Please drop coins for your reservation.
-endmsg
-x 19
-y 19
-end
 arch woodfloor
 x 19
 y 19
 end
+arch chair_1.4
+x 19
+y 19
+end
 arch woodfloor
 x 19
 y 20
@@ -3729,11 +3391,7 @@ arch woodfloor
 x 19
 y 21
 end
-arch swall_1_3_half
-x 19
-y 21
-end
-arch wall_1_4
+arch wall_2_1_2
 x 19
 y 21
 end
@@ -3764,11 +3422,7 @@ arch woodfloor
 x 20
 y 2
 end
-arch swall_1_4_half
-x 20
-y 2
-end
-arch wall_1_3
+arch window_win2
 x 20
 y 2
 end
@@ -3776,471 +3430,495 @@ arch woodfloor
 x 20
 y 3
 end
+arch chair_1.1
+x 20
+y 3
+end
 arch woodfloor
 x 20
 y 4
 end
-arch chair_2.4
+arch table_3
 x 20
 y 4
 end
+arch random_food
+hp 2
+x 20
+y 4
+identified 1
+blessed 1
+end
 arch woodfloor
 x 20
 y 5
 end
-arch dungeon_magic
+arch chair_1.3
+x 20
+y 5
+end
+arch woodfloor
+x 20
+y 6
+end
+arch wall_2_1_2
 x 20
 y 6
 end
 arch woodfloor
 x 20
+y 7
+end
+arch woodfloor
+x 20
+y 8
+end
+arch chair_1.1
+x 20
+y 8
+end
+arch woodfloor
+x 20
+y 9
+end
+arch booze_table
+x 20
+y 9
+end
+arch woodfloor
+x 20
+y 10
+end
+arch chair_1.3
+x 20
+y 10
+end
+arch woodfloor
+x 20
+y 11
+end
+arch woodfloor
+x 20
+y 12
+end
+arch woodfloor
+x 20
+y 13
+end
+arch chair_1.1
+x 20
+y 13
+end
+arch woodfloor
+x 20
+y 14
+end
+arch food_table
+x 20
+y 14
+end
+arch woodfloor
+x 20
+y 15
+end
+arch chair_1.3
+x 20
+y 15
+end
+arch woodfloor
+x 20
+y 16
+end
+arch woodfloor
+x 20
+y 17
+end
+arch wall_2_1_2
+x 20
+y 17
+end
+arch woodfloor
+x 20
+y 18
+end
+arch chair_1.1
+x 20
+y 18
+end
+arch woodfloor
+x 20
+y 19
+end
+arch table_3
+x 20
+y 19
+end
+arch random_food
+hp 2
+x 20
+y 19
+identified 1
+blessed 1
+end
+arch woodfloor
+x 20
+y 20
+end
+arch chair_1.3
+x 20
+y 20
+end
+arch woodfloor
+x 20
+y 21
+end
+arch wall_2_1_2
+x 20
+y 21
+end
+arch grass
+x 20
+y 22
+end
+arch flagstone
+x 20
+y 23
+end
+arch flagstone
+x 20
+y 24
+end
+arch brush
+x 21
+end
+arch tree
+x 21
+y 1
+end
+arch woodfloor
+x 21
+y 2
+end
+arch wall_2_1_2
+x 21
+y 2
+end
+arch woodfloor
+x 21
+y 3
+end
+arch chair_1.1
+x 21
+y 3
+end
+arch woodfloor
+x 21
+y 4
+end
+arch table_3
+x 21
+y 4
+end
+arch random_food
+hp 2
+x 21
+y 4
+identified 1
+blessed 1
+end
+arch woodfloor
+x 21
+y 5
+end
+arch chair_1.3
+x 21
+y 5
+end
+arch woodfloor
+x 21
+y 6
+end
+arch wall_1_3
+x 21
+y 6
+end
+arch woodfloor
+x 21
+y 7
+end
+arch woodfloor
+x 21
+y 8
+end
+arch woodfloor
+x 21
+y 9
+end
+arch chair_1.2
+x 21
+y 9
+end
+arch woodfloor
+x 21
+y 10
+end
+arch woodfloor
+x 21
+y 11
+end
+arch woodfloor
+x 21
+y 12
+end
+arch woodfloor
+x 21
+y 13
+end
+arch woodfloor
+x 21
+y 14
+end
+arch chair_1.2
+x 21
+y 14
+end
+arch woodfloor
+x 21
+y 15
+end
+arch woodfloor
+x 21
+y 16
+end
+arch woodfloor
+x 21
+y 17
+end
+arch wall_1_3
+x 21
+y 17
+end
+arch woodfloor
+x 21
+y 18
+end
+arch chair_1.1
+x 21
+y 18
+end
+arch woodfloor
+x 21
+y 19
+end
+arch table_3
+x 21
+y 19
+end
+arch random_food
+hp 2
+x 21
+y 19
+identified 1
+blessed 1
+end
+arch woodfloor
+x 21
+y 20
+end
+arch chair_1.3
+x 21
+y 20
+end
+arch woodfloor
+x 21
+y 21
+end
+arch wall_2_1_2
+x 21
+y 21
+end
+arch grass
+x 21
+y 22
+end
+arch flagstone
+x 21
+y 23
+end
+arch flagstone
+x 21
+y 24
+end
+arch tree
+x 22
+end
+arch brush
+x 22
+y 1
+end
+arch woodfloor
+x 22
+y 2
+end
+arch wall_2_1_2
+x 22
+y 2
+end
+arch woodfloor
+x 22
+y 3
+end
+arch chair_1.1
+x 22
+y 3
+end
+arch woodfloor
+x 22
+y 4
+end
+arch table_3
+x 22
+y 4
+end
+arch random_food
+hp 2
+x 22
+y 4
+identified 1
+blessed 1
+end
+arch woodfloor
+x 22
+y 5
+end
+arch chair_1.3
+x 22
+y 5
+end
+arch woodfloor
+x 22
 y 6
 end
 arch grate_closed_1
-x 20
+x 22
 y 6
-speed 0.500000
-connected 8
+connected 50
 end
 arch altar
-name pay 1 gold coin
 slaying money
-x 20
+food 1000
+x 22
 y 7
 invisible 1
-connected 8
+connected 50
 end
 arch magic_mouth
 msg
-You see on the door:
-This dining room costs 1 gold to reserve.  Please drop coin for your reservation.
+Private Dining Hall (20 platinum)
 endmsg
-x 20
+x 22
 y 7
 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
+x 22
 y 10
 end
 arch woodfloor
-x 20
-y 11
-end
-arch chair_2.2
-x 20
+x 22
 y 11
 end
 arch woodfloor
-x 20
+x 22
 y 12
 end
 arch woodfloor
-x 20
+x 22
 y 13
 end
 arch woodfloor
-x 20
-y 14
-end
-arch chair_2.2
-x 20
+x 22
 y 14
 end
 arch woodfloor
-x 20
+x 22
 y 15
 end
-arch woodfloor
-x 20
+arch altar
+slaying money
+food 1000
+x 22
+y 16
+invisible 1
+connected 51
+end
+arch magic_mouth
+msg
+Private Dining Hall (20 platinum)
+endmsg
+x 22
 y 16
 end
 arch woodfloor
-x 20
-y 17
-end
-arch wall_2_2_2
-x 20
-y 17
-end
-arch woodfloor
-x 20
-y 18
-end
-arch wall_1_2
-x 20
-y 18
-end
-arch dungeon_magic
-x 20
-y 19
-end
-arch woodfloor
-x 20
-y 19
-end
-arch grate_closed_2
-x 20
-y 19
-speed 0.500000
-connected 7
-end
-arch woodfloor
-x 20
-y 20
-end
-arch wall_1_1
-x 20
-y 20
-end
-arch woodfloor
-x 20
-y 21
-end
-arch wall_3_1
-x 20
-y 21
-end
-arch grass
-x 20
-y 22
-end
-arch flagstone
-x 20
-y 23
-end
-arch flagstone
-x 20
-y 24
-end
-arch brush
-x 21
-end
-arch tree
-x 21
-y 1
-end
-arch dungeon_magic
-x 21
-y 2
-end
-arch woodfloor
-x 21
-y 2
-end
-arch swall_2_1_2
-x 21
-y 2
-end
-arch woodfloor
-x 21
-y 3
-end
-arch chair_2.1
-x 21
-y 3
-end
-arch woodfloor
-x 21
-y 4
-end
-arch table_4
-x 21
-y 4
-end
-arch random_food
-x 21
-y 4
-blessed 1
-end
-arch random_food
-x 21
-y 4
-blessed 1
-end
-arch random_food
-x 21
-y 4
-blessed 1
-end
-arch woodfloor
-x 21
-y 5
-end
-arch chair_2.3
-x 21
-y 5
-end
-arch woodfloor
-x 21
-y 6
-end
-arch dungeon_magic
-x 21
-y 6
-end
-arch wall_1_4
-x 21
-y 6
-end
-arch woodfloor
-x 21
-y 7
-end
-arch woodfloor
-x 21
-y 8
-end
-arch woodfloor
-x 21
-y 9
-end
-arch woodfloor
-x 21
-y 10
-end
-arch woodfloor
-x 21
-y 11
-end
-arch woodfloor
-x 21
-y 12
-end
-arch woodfloor
-x 21
-y 13
-end
-arch woodfloor
-x 21
-y 14
-end
-arch woodfloor
-x 21
-y 15
-end
-arch woodfloor
-x 21
+x 22
 y 16
 end
 arch woodfloor
-x 21
+x 22
 y 17
 end
-arch wall_2_1_2
-x 21
+arch grate_closed_1
+x 22
 y 17
+connected 51
 end
 arch woodfloor
-x 21
+x 22
+y 18
+end
+arch chair_1.1
+x 22
 y 18
 end
 arch woodfloor
-x 21
+x 22
 y 19
 end
-arch chair_2.4
-x 21
+arch table_3
+x 22
 y 19
 end
+arch random_food
+hp 2
+x 22
+y 19
+identified 1
+blessed 1
+end
 arch woodfloor
-x 21
+x 22
+y 20
+end
+arch chair_1.3
+x 22
 y 20
 end
 arch woodfloor
-x 21
+x 22
 y 21
 end
 arch wall_2_1_2
-x 21
-y 21
-end
-arch grass
-x 21
-y 22
-end
-arch flagstone
-x 21
-y 23
-end
-arch flagstone
-x 21
-y 24
-end
-arch tree
-x 22
-end
-arch brush
-x 22
-y 1
-end
-arch woodfloor
-x 22
-y 2
-end
-arch wall_2_2_2
-x 22
-y 2
-end
-arch swall_1_3_half
-x 22
-y 2
-end
-arch woodfloor
-x 22
-y 3
-end
-arch swall_1_1_half
-x 22
-y 3
-end
-arch wall_1_2
-x 22
-y 3
-end
-arch dungeon_magic
-x 22
-y 4
-end
-arch woodfloor
-x 22
-y 4
-end
-arch swall_2_1_1
-x 22
-y 4
-end
-arch woodfloor
-x 22
-y 5
-end
-arch swall_1_2_half
-x 22
-y 5
-end
-arch wall_1_1
-x 22
-y 5
-end
-arch woodfloor
-x 22
-y 6
-end
-arch wall_2_2_4
-x 22
-y 6
-end
-arch woodfloor
-x 22
-y 7
-end
-arch woodfloor
-x 22
-y 8
-end
-arch woodfloor
-x 22
-y 9
-end
-arch woodfloor
-x 22
-y 10
-end
-arch woodfloor
-x 22
-y 11
-end
-arch woodfloor
-x 22
-y 12
-end
-arch woodfloor
-x 22
-y 13
-end
-arch woodfloor
-x 22
-y 14
-end
-arch woodfloor
-x 22
-y 15
-end
-arch woodfloor
-x 22
-y 16
-end
-arch woodfloor
-x 22
-y 17
-end
-arch swall_1_4_half
-x 22
-y 17
-end
-arch wall_1_3
-x 22
-y 17
-end
-arch woodfloor
-x 22
-y 18
-end
-arch chair_2.1
-x 22
-y 18
-end
-arch woodfloor
-x 22
-y 19
-end
-arch table_4
-x 22
-y 19
-end
-arch random_food
-x 22
-y 19
-blessed 1
-end
-arch random_food
-x 22
-y 19
-blessed 1
-end
-arch random_food
-x 22
-y 19
-blessed 1
-end
-arch woodfloor
-x 22
-y 20
-end
-arch chair_2.3
-x 22
-y 20
-end
-arch woodfloor
-x 22
-y 21
-end
-arch swall_1_4_half
-x 22
-y 21
-end
-arch wall_1_3
 x 22
 y 21
 end
@@ -4271,11 +3949,7 @@ arch woodfloor
 x 23
 y 2
 end
-arch swall_1_4_half
-x 23
-y 2
-end
-arch wall_1_3
+arch wall_2_1_2
 x 23
 y 2
 end
@@ -4283,22 +3957,41 @@ arch woodfloor
 x 23
 y 3
 end
+arch chair_1.1
+x 23
+y 3
+end
 arch woodfloor
 x 23
 y 4
 end
-arch chair_2.4
+arch table_3
 x 23
 y 4
 end
+arch random_food
+hp 2
+x 23
+y 4
+identified 1
+blessed 1
+end
 arch woodfloor
 x 23
 y 5
 end
+arch chair_1.3
+x 23
+y 5
+end
 arch woodfloor
 x 23
 y 6
 end
+arch wall_1_4
+x 23
+y 6
+end
 arch woodfloor
 x 23
 y 7
@@ -4307,14 +4000,14 @@ arch woodfloor
 x 23
 y 8
 end
-arch chair_2.4
-x 23
-y 8
-end
 arch woodfloor
 x 23
 y 9
 end
+arch chair_1.4
+x 23
+y 9
+end
 arch woodfloor
 x 23
 y 10
@@ -4323,10 +4016,6 @@ arch woodfloor
 x 23
 y 11
 end
-arch chair_2.4
-x 23
-y 11
-end
 arch woodfloor
 x 23
 y 12
@@ -4339,7 +4028,7 @@ arch woodfloor
 x 23
 y 14
 end
-arch chair_2.4
+arch chair_1.4
 x 23
 y 14
 end
@@ -4351,15 +4040,11 @@ arch woodfloor
 x 23
 y 16
 end
-arch dungeon_magic
-x 23
-y 17
-end
 arch woodfloor
 x 23
 y 17
 end
-arch swall_2_1_2
+arch wall_1_4
 x 23
 y 17
 end
@@ -4367,7 +4052,7 @@ arch woodfloor
 x 23
 y 18
 end
-arch chair_2.1
+arch chair_1.1
 x 23
 y 18
 end
@@ -4375,42 +4060,30 @@ arch woodfloor
 x 23
 y 19
 end
-arch table_4
+arch table_3
 x 23
 y 19
 end
 arch random_food
+hp 2
 x 23
 y 19
-blessed 1
-end
-arch random_food
-x 23
-y 19
-blessed 1
-end
-arch random_food
-x 23
-y 19
+identified 1
 blessed 1
 end
 arch woodfloor
 x 23
 y 20
 end
-arch chair_2.3
+arch chair_1.3
 x 23
 y 20
 end
-arch dungeon_magic
-x 23
-y 21
-end
 arch woodfloor
 x 23
 y 21
 end
-arch swall_2_1_2
+arch wall_2_1_2
 x 23
 y 21
 end
@@ -4433,15 +4106,11 @@ arch brush
 x 24
 y 1
 end
-arch dungeon_magic
-x 24
-y 2
-end
 arch woodfloor
 x 24
 y 2
 end
-arch swall_2_1_2
+arch window_win2
 x 24
 y 2
 end
@@ -4449,7 +4118,7 @@ arch woodfloor
 x 24
 y 3
 end
-arch chair_2.1
+arch chair_1.1
 x 24
 y 3
 end
@@ -4457,15 +4126,22 @@ arch woodfloor
 x 24
 y 4
 end
-arch table_4
+arch table_3
 x 24
 y 4
 end
+arch random_food
+hp 2
+x 24
+y 4
+identified 1
+blessed 1
+end
 arch woodfloor
 x 24
 y 5
 end
-arch chair_2.3
+arch chair_1.3
 x 24
 y 5
 end
@@ -4473,13 +4149,21 @@ arch woodfloor
 x 24
 y 6
 end
+arch wall_2_1_2
+x 24
+y 6
+end
 arch woodfloor
 x 24
 y 7
 end
-arch chair_2.1
+arch woodfloor
 x 24
-y 7
+y 8
+end
+arch chair_1.1
+x 24
+y 8
 end
 arch sage
 msg
@@ -4495,23 +4179,16 @@ I mean dangerous as in those that bother or upset the Zorns end up dead.  Haemon
 You must be strong to survive in the dungeons of Brest.  Look at me, I have grown too old.
 endmsg
 x 24
-y 7
+y 8
 friendly 1
 unaggressive 0
 end
 arch woodfloor
 x 24
-y 8
-end
-arch table_4
-x 24
-y 8
-end
-arch woodfloor
-x 24
 y 9
 end
-arch chair_2.3
+arch dragon_steak_table
+name serving steak (15 g.c. @)
 x 24
 y 9
 end
@@ -4519,11 +4196,11 @@ arch woodfloor
 x 24
 y 10
 end
-arch woodfloor
+arch chair_1.3
 x 24
-y 11
+y 10
 end
-arch table_4
+arch woodfloor
 x 24
 y 11
 end
@@ -4535,7 +4212,7 @@ arch woodfloor
 x 24
 y 13
 end
-arch chair_2.1
+arch chair_1.1
 x 24
 y 13
 end
@@ -4543,24 +4220,15 @@ arch woodfloor
 x 24
 y 14
 end
-arch table_4
+arch waybread_table
 x 24
 y 14
 end
-arch wine
-name bottle of Mogen David
-msg
-A strong wine.
-endmsg
-x 24
-y 14
-no_pick 1
-end
 arch woodfloor
 x 24
 y 15
 end
-arch chair_2.3
+arch chair_1.3
 x 24
 y 15
 end
@@ -4572,11 +4240,7 @@ arch woodfloor
 x 24
 y 17
 end
-arch swall_1_3_half
-x 24
-y 17
-end
-arch wall_1_4
+arch wall_2_1_2
 x 24
 y 17
 end
@@ -4584,7 +4248,7 @@ arch woodfloor
 x 24
 y 18
 end
-arch chair_2.1
+arch chair_1.1
 x 24
 y 18
 end
@@ -4592,30 +4256,22 @@ arch woodfloor
 x 24
 y 19
 end
-arch table_4
+arch table_3
 x 24
 y 19
 end
 arch random_food
+hp 2
 x 24
 y 19
-blessed 1
-end
-arch random_food
-x 24
-y 19
-blessed 1
-end
-arch random_food
-x 24
-y 19
+identified 1
 blessed 1
 end
 arch woodfloor
 x 24
 y 20
 end
-arch chair_2.3
+arch chair_1.3
 x 24
 y 20
 end
@@ -4623,11 +4279,7 @@ arch woodfloor
 x 24
 y 21
 end
-arch swall_1_3_half
-x 24
-y 21
-end
-arch wall_1_4
+arch wall_2_1_2
 x 24
 y 21
 end
@@ -4654,11 +4306,7 @@ arch woodfloor
 x 25
 y 2
 end
-arch swall_1_3_half
-x 25
-y 2
-end
-arch wall_1_4
+arch wall_2_1_2
 x 25
 y 2
 end
@@ -4670,7 +4318,7 @@ arch woodfloor
 x 25
 y 4
 end
-arch chair_2.2
+arch chair_1.2
 x 25
 y 4
 end
@@ -4682,6 +4330,10 @@ arch woodfloor
 x 25
 y 6
 end
+arch wall_2_1_2
+x 25
+y 6
+end
 arch woodfloor
 x 25
 y 7
@@ -4690,14 +4342,14 @@ arch woodfloor
 x 25
 y 8
 end
-arch chair_2.2
-x 25
-y 8
-end
 arch woodfloor
 x 25
 y 9
 end
+arch chair_1.2
+x 25
+y 9
+end
 arch woodfloor
 x 25
 y 10
@@ -4706,10 +4358,6 @@ arch woodfloor
 x 25
 y 11
 end
-arch chair_2.2
-x 25
-y 11
-end
 arch woodfloor
 x 25
 y 12
@@ -4722,7 +4370,7 @@ arch woodfloor
 x 25
 y 14
 end
-arch chair_2.2
+arch chair_1.2
 x 25
 y 14
 end
@@ -4792,7 +4440,7 @@ arch woodfloor
 x 25
 y 19
 end
-arch chair_2.2
+arch chair_1.2
 x 25
 y 19
 end
@@ -4847,23 +4495,15 @@ arch woodfloor
 x 26
 y 4
 end
-arch swall_1_1_half
+arch window_win1
 x 26
 y 4
 end
-arch wall_1_2
-x 26
-y 4
-end
-arch dungeon_magic
-x 26
-y 5
-end
 arch woodfloor
 x 26
 y 5
 end
-arch swall_2_1_1
+arch wall_2_1_1
 x 26
 y 5
 end
@@ -4871,11 +4511,7 @@ arch woodfloor
 x 26
 y 6
 end
-arch swall_1_2_half
-x 26
-y 6
-end
-arch wall_1_1
+arch wall_3_4
 x 26
 y 6
 end
@@ -4883,23 +4519,15 @@ arch woodfloor
 x 26
 y 7
 end
-arch swall_1_1_half
+arch wall_2_1_1
 x 26
 y 7
 end
-arch wall_1_2
-x 26
-y 7
-end
-arch dungeon_magic
-x 26
-y 8
-end
 arch woodfloor
 x 26
 y 8
 end
-arch swall_2_1_1
+arch wall_2_1_1
 x 26
 y 8
 end
@@ -4907,11 +4535,7 @@ arch woodfloor
 x 26
 y 9
 end
-arch swall_1_2_half
-x 26
-y 9
-end
-arch wall_1_1
+arch wall_2_1_1
 x 26
 y 9
 end
@@ -4919,23 +4543,15 @@ arch woodfloor
 x 26
 y 10
 end
-arch swall_1_1_half
+arch wall_2_1_1
 x 26
 y 10
 end
-arch wall_1_2
-x 26
-y 10
-end
-arch dungeon_magic
-x 26
-y 11
-end
 arch woodfloor
 x 26
 y 11
 end
-arch swall_2_1_1
+arch wall_2_1_1
 x 26
 y 11
 end
@@ -4943,11 +4559,7 @@ arch woodfloor
 x 26
 y 12
 end
-arch swall_1_2_half
-x 26
-y 12
-end
-arch wall_1_1
+arch wall_2_1_1
 x 26
 y 12
 end
@@ -4955,23 +4567,15 @@ arch woodfloor
 x 26
 y 13
 end
-arch swall_1_1_half
+arch wall_2_1_1
 x 26
 y 13
 end
-arch wall_1_2
-x 26
-y 13
-end
-arch dungeon_magic
-x 26
-y 14
-end
 arch woodfloor
 x 26
 y 14
 end
-arch swall_2_1_1
+arch wall_2_1_1
 x 26
 y 14
 end
@@ -4979,11 +4583,7 @@ arch woodfloor
 x 26
 y 15
 end
-arch swall_1_2_half
-x 26
-y 15
-end
-arch wall_1_1
+arch wall_2_1_1
 x 26
 y 15
 end
@@ -5007,23 +4607,15 @@ arch woodfloor
 x 26
 y 18
 end
-arch swall_1_1_half
+arch wall_2_1_1
 x 26
 y 18
 end
-arch wall_1_2
-x 26
-y 18
-end
-arch dungeon_magic
-x 26
-y 19
-end
 arch woodfloor
 x 26
 y 19
 end
-arch swall_2_1_1
+arch wall_2_1_1
 x 26
 y 19
 end
@@ -5031,11 +4623,7 @@ arch woodfloor
 x 26
 y 20
 end
-arch swall_1_2_half
-x 26
-y 20
-end
-arch wall_1_1
+arch wall_2_1_1
 x 26
 y 20
 end
diff --git a/world/world_107_123 b/world/world_107_123
index 5f97fe4d5..7766dd30c 100644
--- a/world/world_107_123
+++ b/world/world_107_123
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2013-05-30 Rick Tanner
+Modified: 2013-08-06 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_107_122
@@ -5723,7 +5723,7 @@ y 31
 elevation 1566
 end
 arch l_shop1
-name Acme Inc.
+name Acme Inc. Building Shop
 slaying /brest/shops/buildshop
 hp 6
 sp 24
@@ -7094,7 +7094,7 @@ x 25
 y 35
 end
 arch t_house2_fant
-name Brest town house
+name Brest Private Apartment
 slaying /brest/apartments/brest_town_house
 hp 8
 sp 32
@@ -8858,10 +8858,10 @@ y 29
 elevation 2520
 end
 arch inn_fant
-name Brest inn
+name Brest Inn
 slaying /brest/brest.inn
 hp 14
-sp 23
+sp 19
 x 31
 y 29
 end
@@ -9418,10 +9418,6 @@ x 33
 y 17
 elevation 2081
 end
-arch evergreens2
-x 33
-y 17
-end
 arch fort
 name Nasty Hallway
 slaying /brest/pantheon
@@ -9786,10 +9782,6 @@ x 34
 y 17
 elevation 2408
 end
-arch evergreens2
-x 34
-y 17
-end
 arch brush
 x 34
 y 18
@@ -10499,7 +10491,7 @@ y 29
 elevation 1283
 end
 arch house_1
-name trademarket
+name Trade Market
 slaying /brest/brest.trademarket
 hp 7
 sp 15