diff --git a/wolfsburg/taverns/thebloodycutlass b/wolfsburg/taverns/thebloodycutlass
index 55354ec8f..1a5c3d183 100644
--- a/wolfsburg/taverns/thebloodycutlass
+++ b/wolfsburg/taverns/thebloodycutlass
@@ -2,137 +2,891 @@ arch map
 name The Bloody Cutlass
 difficulty 3
 region wolfsburg
-width 14
-height 16
-enter_x 2
-enter_y 1
+width 25
+height 17
+enter_x 12
+enter_y 12
 msg
 Created:  2011-10-05 Rick Tanner
-Modified: 2011-10-05 Rick Tanner
+Modified: 2011-10-06 Rick Tanner
 endmsg
+outdoor 1
 end
-arch woodfloor
+arch cobblestones2
 end
-arch wwall_2_2_2
-end
-arch woodfloor
+arch cobblestones2
 y 1
 end
-arch wwall_2_1_1
-y 1
-end
-arch woodfloor
+arch cobblestones2
 y 2
 end
-arch wwall_2_1_1
-y 2
-end
-arch woodfloor
+arch cobblestones2
 y 3
 end
-arch wwall_2_1_1
-y 3
-end
-arch woodfloor
+arch cobblestones2
 y 4
 end
-arch wwall_2_1_1
-y 4
-end
-arch woodfloor
+arch cobblestones2
 y 5
 end
-arch wwall_2_1_1
+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
+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 2
+end
+arch cobblestones2
+x 2
+y 1
+end
+arch woodfloor
+x 2
+y 2
+end
+arch wall_2_2_2
+x 2
+y 2
+end
+arch light2
+x 2
+y 3
+end
+arch woodfloor
+x 2
+y 3
+end
+arch window_win1
+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
+x 2
 y 5
 end
 arch woodfloor
+x 2
 y 6
 end
-arch wwall_2_1_1
+arch wall_3_2
+x 2
 y 6
 end
-arch woodfloor
-y 7
-end
-arch wwall_2_1_1
+arch light2
+x 2
 y 7
 end
 arch woodfloor
-y 8
+x 2
+y 7
 end
-arch wwall_2_1_1
-y 8
+arch window_win1
+x 2
+y 7
 end
 arch woodfloor
-y 9
+x 2
+y 8
 end
-arch wwall_2_1_1
+arch wall_2_1_1
+x 2
+y 8
+end
+arch light2
+x 2
 y 9
 end
 arch woodfloor
+x 2
+y 9
+end
+arch window_win1
+x 2
+y 9
+end
+arch woodfloor
+x 2
 y 10
 end
-arch wwall_2_1_1
+arch wall_3_2
+x 2
 y 10
 end
 arch woodfloor
+x 2
 y 11
 end
-arch wwall_2_1_1
+arch wall_2_1_1
+x 2
 y 11
 end
-arch woodfloor
-y 12
-end
-arch wwall_3_2
+arch light2
+x 2
 y 12
 end
 arch woodfloor
+x 2
+y 12
+end
+arch window_win1
+x 2
+y 12
+end
+arch woodfloor
+x 2
 y 13
 end
-arch wwall_2_1_1
+arch wall_2_1_1
+x 2
 y 13
 end
 arch woodfloor
+x 2
 y 14
 end
-arch wwall_2_1_1
+arch wall_2_2_1
+x 2
 y 14
 end
-arch woodfloor
+arch cobblestones2
+x 2
 y 15
 end
-arch wwall_2_2_1
-y 15
+arch cobblestones2
+x 2
+y 16
 end
-arch woodfloor
-x 1
+arch cobblestones2
+x 3
 end
-arch wwall_1_3
-x 1
-end
-arch woodfloor
-x 1
+arch cobblestones2
+x 3
 y 1
 end
 arch woodfloor
-x 1
+x 3
+y 2
+end
+arch wall_2_1_2
+x 3
 y 2
 end
 arch woodfloor
-x 1
+x 3
+y 3
+end
+arch chair_1.4
+x 3
 y 3
 end
 arch woodfloor
-x 1
+x 3
+y 4
+end
+arch light4
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 5
+end
+arch bed_save
+x 3
+y 5
+end
+arch woodfloor
+x 3
+y 6
+end
+arch wall_2_1_2
+x 3
+y 6
+end
+arch woodfloor
+x 3
+y 7
+end
+arch woodfloor
+x 3
+y 8
+end
+arch woodfloor
+x 3
+y 9
+end
+arch woodfloor
+x 3
+y 10
+end
+arch wall_1_3
+x 3
+y 10
+end
+arch woodfloor
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
+end
+arch woodfloor
+x 3
+y 13
+end
+arch bed_save
+x 3
+y 13
+end
+arch woodfloor
+x 3
+y 14
+end
+arch wall_2_1_2
+x 3
+y 14
+end
+arch cobblestones2
+x 3
+y 15
+end
+arch cobblestones2
+x 3
+y 16
+end
+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 table
+x 4
+y 3
+end
+arch woodfloor
+x 4
 y 4
 end
 arch woodfloor
-x 1
+x 4
+y 5
+end
+arch woodfloor
+x 4
+y 6
+end
+arch wall_1_3
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch woodfloor
+x 4
+y 8
+end
+arch woodfloor
+x 4
+y 9
+end
+arch woodfloor
+x 4
+y 10
+end
+arch oakdoor_2
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
+arch woodfloor
+x 4
+y 12
+end
+arch light4
+x 4
+y 13
+end
+arch woodfloor
+x 4
+y 13
+end
+arch woodfloor
+x 4
+y 14
+end
+arch wall_2_1_2
+x 4
+y 14
+end
+arch cobblestones2
+x 4
+y 15
+end
+arch cobblestones2
+x 4
+y 16
+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 chair_1.2
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
+arch woodfloor
+x 5
+y 5
+end
+arch woodfloor
+x 5
+y 6
+end
+arch oakdoor_2
+x 5
+y 6
+end
+arch woodfloor
+x 5
+y 7
+end
+arch light4
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch wall_1_4
+x 5
+y 10
+end
+arch woodfloor
+x 5
+y 11
+end
+arch chair_1.4
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
+arch light2
+x 5
+y 14
+end
+arch woodfloor
+x 5
+y 14
+end
+arch window_win2
+x 5
+y 14
+end
+arch cobblestones2
+x 5
+y 15
+end
+arch cobblestones2
+x 5
+y 16
+end
+arch cobblestones2
+x 6
+end
+arch cobblestones2
+x 6
+y 1
+end
+arch woodfloor
+x 6
+y 2
+end
+arch wall_2_1_2
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch wall_1_4
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch wall_2_1_2
+x 6
+y 10
+end
+arch light4
+x 6
+y 11
+end
+arch woodfloor
+x 6
+y 11
+end
+arch table_4
+x 6
+y 11
+end
+arch woodfloor
+x 6
+y 12
+end
+arch woodfloor
+x 6
+y 13
+end
+arch woodfloor
+x 6
+y 14
+end
+arch wall_2_1_2
+x 6
+y 14
+end
+arch cobblestones2
+x 6
+y 15
+end
+arch cobblestones2
+x 6
+y 16
+end
+arch cobblestones2
+x 7
+end
+arch cobblestones2
+x 7
+y 1
+end
+arch woodfloor
+x 7
+y 2
+end
+arch wall_2_1_2
+x 7
+y 2
+end
+arch light4
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 3
+end
+arch bed_save
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
+arch woodfloor
+x 7
+y 6
+end
+arch wall_2_1_2
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch wall_2_1_2
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch chair_1.2
+x 7
+y 11
+end
+arch woodfloor
+x 7
+y 12
+end
+arch woodfloor
+x 7
+y 13
+end
+arch bed_save
+x 7
+y 13
+end
+arch woodfloor
+x 7
+y 14
+end
+arch wall_2_1_2
+x 7
+y 14
+end
+arch cobblestones2
+x 7
+y 15
+end
+arch cobblestones2
+x 7
+y 16
+end
+arch cobblestones2
+x 8
+end
+arch cobblestones2
+x 8
+y 1
+end
+arch woodfloor
+x 8
+y 2
+end
+arch wall_3_3
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
+arch wall_2_1_1
+x 8
+y 3
+end
+arch woodfloor
+x 8
+y 4
+end
+arch wall_2_1_1
+x 8
+y 4
+end
+arch woodfloor
+x 8
+y 5
+end
+arch wall_2_1_1
+x 8
+y 5
+end
+arch woodfloor
+x 8
+y 6
+end
+arch wall_2_2_4
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch light4
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch woodfloor
+x 8
+y 10
+end
+arch wall_2_2_3
+x 8
+y 10
+end
+arch woodfloor
+x 8
+y 11
+end
+arch wall_2_1_1
+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_3_1
+x 8
+y 14
+end
+arch cobblestones2
+x 8
+y 15
+end
+arch cobblestones2
+x 8
+y 16
+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 light4
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
 y 5
 end
 arch chair_1.1
-x 1
+x 9
 y 5
 end
 arch pirate
@@ -141,207 +895,210 @@ msg
 @match *
 ..*hicks*..
 endmsg
-x 1
+x 9
 y 5
 friendly 1
 end
 arch woodfloor
-x 1
+x 9
 y 6
 end
 arch table_4
-x 1
+x 9
 y 6
 end
 arch woodfloor
-x 1
+x 9
 y 7
 end
 arch woodfloor
-x 1
+x 9
 y 8
 end
 arch woodfloor
-x 1
+x 9
 y 9
 end
 arch woodfloor
-x 1
+x 9
 y 10
 end
-arch woodfloor
-x 1
+arch light4
+x 9
 y 11
 end
 arch woodfloor
-x 1
-y 12
+x 9
+y 11
 end
-arch wwall_1_3
-x 1
+arch woodfloor
+x 9
 y 12
 end
 arch woodfloor
-x 1
+x 9
 y 13
 end
 arch woodfloor
-x 1
+x 9
 y 14
 end
-arch bed_save
-x 1
+arch wall_2_1_2
+x 9
 y 14
 end
-arch woodfloor
-x 1
+arch cobblestones2
+x 9
 y 15
 end
-arch wwall_2_1_2
-x 1
-y 15
+arch cobblestones2
+x 9
+y 16
 end
-arch woodfloor
-x 2
+arch cobblestones2
+x 10
 end
-arch oakdoor_2
-slaying ../../world/world_128_109
-hp 36
-sp 11
-x 2
-end
-arch woodfloor
-x 2
+arch cobblestones2
+x 10
 y 1
 end
 arch woodfloor
-x 2
+x 10
+y 2
+end
+arch wall_2_1_2
+x 10
 y 2
 end
 arch woodfloor
-x 2
+x 10
 y 3
 end
 arch woodfloor
-x 2
+x 10
 y 4
 end
 arch woodfloor
-x 2
+x 10
 y 5
 end
 arch woodfloor
-x 2
+x 10
 y 6
 end
 arch chair_1.2
-x 2
+x 10
 y 6
 end
 arch woodfloor
-x 2
+x 10
 y 7
 end
 arch woodfloor
-x 2
+x 10
 y 8
 end
 arch chair_1.4
-x 2
+x 10
 y 8
 end
 arch woodfloor
-x 2
+x 10
 y 9
 end
 arch woodfloor
-x 2
+x 10
 y 10
 end
 arch woodfloor
-x 2
+x 10
 y 11
 end
 arch woodfloor
-x 2
-y 12
-end
-arch door_look_1
-x 2
+x 10
 y 12
 end
 arch woodfloor
-x 2
+x 10
 y 13
 end
-arch woodfloor
-x 2
+arch light2
+x 10
 y 14
 end
 arch woodfloor
-x 2
+x 10
+y 14
+end
+arch window_win2
+x 10
+y 14
+end
+arch cobblestones2
+x 10
 y 15
 end
-arch wwall_2_1_2
-x 2
-y 15
+arch cobblestones2
+x 10
+y 16
 end
-arch woodfloor
-x 3
+arch cobblestones2
+x 11
 end
-arch wwall_1_4
-x 3
-end
-arch woodfloor
-x 3
+arch cobblestones2
+x 11
 y 1
 end
 arch woodfloor
-x 3
+x 11
+y 2
+end
+arch wall_2_1_2
+x 11
 y 2
 end
 arch woodfloor
-x 3
+x 11
 y 3
 end
 arch woodfloor
-x 3
+x 11
 y 4
 end
 arch woodfloor
-x 3
+x 11
 y 5
 end
 arch chair_1.4
-x 3
+x 11
 y 5
 end
 arch woodfloor
-x 3
+x 11
 y 6
 end
 arch woodfloor
-x 3
+x 11
 y 7
 end
 arch chair_1.1
-x 3
+x 11
 y 7
 end
 arch woodfloor
-x 3
+x 11
 y 8
 end
 arch table_4
-x 3
+x 11
 y 8
 end
 arch woodfloor
-x 3
+x 11
 y 9
 end
 arch chair_1.3
-x 3
+x 11
 y 9
 end
 arch pirate
@@ -350,172 +1107,220 @@ msg
 @match *
 ..*hicks*..
 endmsg
-x 3
+x 11
 y 9
 friendly 1
 end
 arch woodfloor
-x 3
+x 11
 y 10
 end
 arch woodfloor
-x 3
+x 11
 y 11
 end
 arch chair_1.4
-x 3
+x 11
 y 11
 end
 arch woodfloor
-x 3
+x 11
 y 12
 end
-arch wwall_1_4
-x 3
-y 12
+arch button_small
+x 11
+y 13
+connected 1
 end
 arch woodfloor
-x 3
-y 13
-end
-arch chair_1.4
-x 3
+x 11
 y 13
 end
 arch woodfloor
-x 3
+x 11
 y 14
 end
-arch woodfloor
-x 3
+arch wall_1_3
+x 11
+y 14
+end
+arch dungeon_magic
+x 11
 y 15
 end
-arch wwall_2_1_2
-x 3
+arch invis_exit
+slaying ../../world/world_128_109
+hp 36
+sp 11
+x 11
 y 15
 end
-arch woodfloor
-x 4
+arch cobblestones2
+x 11
+y 15
 end
-arch wwall_2_1_2
-x 4
+arch cobblestones2
+x 11
+y 16
 end
-arch woodfloor
-x 4
+arch cobblestones2
+x 12
+end
+arch cobblestones2
+x 12
 y 1
 end
 arch woodfloor
-x 4
+x 12
+y 2
+end
+arch wall_2_1_2
+x 12
 y 2
 end
 arch woodfloor
-x 4
+x 12
 y 3
 end
+arch light4
+x 12
+y 4
+end
 arch woodfloor
-x 4
+x 12
 y 4
 end
 arch chair_1.1
-x 4
+x 12
 y 4
 end
 arch woodfloor
-x 4
+x 12
 y 5
 end
 arch table_4
-x 4
+x 12
 y 5
 end
 arch woodfloor
-x 4
+x 12
 y 6
 end
 arch woodfloor
-x 4
+x 12
 y 7
 end
+arch light4
+x 12
+y 8
+end
 arch woodfloor
-x 4
+x 12
 y 8
 end
 arch chair_1.2
-x 4
+x 12
 y 8
 end
 arch woodfloor
-x 4
+x 12
 y 9
 end
 arch woodfloor
-x 4
+x 12
 y 10
 end
-arch woodfloor
-x 4
-y 11
-end
-arch table_4
-x 4
+arch light4
+x 12
 y 11
 end
 arch woodfloor
-x 4
-y 12
-end
-arch wwall_2_1_2
-x 4
-y 12
-end
-arch woodfloor
-x 4
-y 13
+x 12
+y 11
 end
 arch table
-x 4
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
+arch button_small
+x 12
+y 13
+connected 1
+end
+arch woodfloor
+x 12
 y 13
 end
+arch button_small
+x 12
+y 14
+connected 1
+end
 arch woodfloor
-x 4
+x 12
 y 14
 end
-arch woodfloor
-x 4
+arch odoorn2_closed_1
+x 12
+y 14
+connected 1
+end
+arch light4
+x 12
 y 15
 end
-arch wwall_2_1_2
-x 4
+arch dungeon_magic
+x 12
 y 15
 end
-arch woodfloor
-x 5
+arch invis_exit
+slaying ../../world/world_128_109
+hp 36
+sp 11
+x 12
+y 15
 end
-arch wwall_2_1_2
-x 5
+arch cobblestones2
+x 12
+y 15
 end
-arch woodfloor
-x 5
+arch cobblestones2
+x 12
+y 16
+end
+arch cobblestones2
+x 13
+end
+arch cobblestones2
+x 13
 y 1
 end
 arch woodfloor
-x 5
+x 13
+y 2
+end
+arch wall_2_1_2
+x 13
 y 2
 end
 arch woodfloor
-x 5
+x 13
 y 3
 end
 arch woodfloor
-x 5
+x 13
 y 4
 end
 arch woodfloor
-x 5
+x 13
 y 5
 end
 arch chair_1.2
-x 5
+x 13
 y 5
 end
 arch pirate
@@ -524,663 +1329,633 @@ msg
 @match *
 ..*hicks*..
 endmsg
-x 5
+x 13
 y 5
 friendly 1
 end
 arch woodfloor
-x 5
+x 13
 y 6
 end
 arch woodfloor
-x 5
+x 13
 y 7
 end
 arch woodfloor
-x 5
+x 13
 y 8
 end
 arch woodfloor
-x 5
+x 13
 y 9
 end
 arch woodfloor
-x 5
+x 13
 y 10
 end
 arch woodfloor
-x 5
+x 13
 y 11
 end
 arch chair_1.2
-x 5
+x 13
 y 11
 end
-arch woodfloor
-x 5
-y 12
-end
-arch wwall_2_1_2
-x 5
-y 12
+arch pirate
+name drunk pirate
+msg
+@match *
+..*hicks*..
+endmsg
+x 13
+y 11
+friendly 1
 end
 arch woodfloor
-x 5
+x 13
+y 12
+end
+arch button_small
+x 13
 y 13
+connected 1
 end
-arch chair_1.2
-x 5
+arch woodfloor
+x 13
 y 13
 end
 arch woodfloor
-x 5
+x 13
 y 14
 end
+arch wall_1_4
+x 13
+y 14
+end
+arch dungeon_magic
+x 13
+y 15
+end
+arch invis_exit
+slaying ../../world/world_128_109
+hp 36
+sp 11
+x 13
+y 15
+end
+arch cobblestones2
+x 13
+y 15
+end
+arch cobblestones2
+x 13
+y 16
+end
+arch cobblestones2
+x 14
+end
+arch cobblestones2
+x 14
+y 1
+end
+arch woodfloor
+x 14
+y 2
+end
+arch wall_2_1_2
+x 14
+y 2
+end
+arch woodfloor
+x 14
+y 3
+end
+arch woodfloor
+x 14
+y 4
+end
+arch woodfloor
+x 14
+y 5
+end
+arch woodfloor
+x 14
+y 6
+end
+arch woodfloor
+x 14
+y 7
+end
+arch woodfloor
+x 14
+y 8
+end
+arch woodfloor
+x 14
+y 9
+end
+arch woodfloor
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch woodfloor
+x 14
+y 12
+end
+arch woodfloor
+x 14
+y 13
+end
+arch light2
+x 14
+y 14
+end
+arch woodfloor
+x 14
+y 14
+end
+arch window_win2
+x 14
+y 14
+end
+arch cobblestones2
+x 14
+y 15
+end
+arch cobblestones2
+x 14
+y 16
+end
+arch cobblestones2
+x 15
+end
+arch cobblestones2
+x 15
+y 1
+end
+arch woodfloor
+x 15
+y 2
+end
+arch wall_2_1_2
+x 15
+y 2
+end
+arch woodfloor
+x 15
+y 3
+end
+arch light4
+x 15
+y 4
+end
+arch woodfloor
+x 15
+y 4
+end
+arch woodfloor
+x 15
+y 5
+end
+arch woodfloor
+x 15
+y 6
+end
+arch woodfloor
+x 15
+y 7
+end
+arch light4
+x 15
+y 8
+end
+arch woodfloor
+x 15
+y 8
+end
+arch woodfloor
+x 15
+y 9
+end
+arch woodfloor
+x 15
+y 10
+end
+arch light4
+x 15
+y 11
+end
+arch woodfloor
+x 15
+y 11
+end
+arch woodfloor
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
+arch woodfloor
+x 15
+y 14
+end
+arch wall_2_1_2
+x 15
+y 14
+end
+arch cobblestones2
+x 15
+y 15
+end
+arch cobblestones2
+x 15
+y 16
+end
+arch cobblestones2
+x 16
+end
+arch cobblestones2
+x 16
+y 1
+end
+arch woodfloor
+x 16
+y 2
+end
+arch wall_2_1_2
+x 16
+y 2
+end
+arch woodfloor
+x 16
+y 3
+end
+arch woodfloor
+x 16
+y 3
+end
+arch door_look_2
+x 16
+y 3
+move_block 0
+end
+arch woodfloor
+x 16
+y 4
+end
+arch wall_1_1
+x 16
+y 4
+end
+arch woodfloor
+x 16
+y 5
+end
+arch wall_2_2_1
+x 16
+y 5
+end
+arch woodfloor
+x 16
+y 6
+end
+arch woodfloor
+x 16
+y 6
+end
+arch door_look_2
+x 16
+y 6
+move_block 0
+end
+arch woodfloor
+x 16
+y 7
+end
+arch wall_1_1
+x 16
+y 7
+end
+arch woodfloor
+x 16
+y 8
+end
+arch wall_2_2_1
+x 16
+y 8
+end
+arch woodfloor
+x 16
+y 9
+end
+arch woodfloor
+x 16
+y 9
+end
+arch door_look_2
+x 16
+y 9
+move_block 0
+end
+arch woodfloor
+x 16
+y 10
+end
+arch wall_1_1
+x 16
+y 10
+end
+arch woodfloor
+x 16
+y 11
+end
+arch wall_2_2_1
+x 16
+y 11
+end
+arch woodfloor
+x 16
+y 12
+end
+arch woodfloor
+x 16
+y 12
+end
+arch door_look_2
+x 16
+y 12
+move_block 0
+end
+arch woodfloor
+x 16
+y 13
+end
+arch wall_1_1
+x 16
+y 13
+end
+arch woodfloor
+x 16
+y 14
+end
+arch wall_3_1
+x 16
+y 14
+end
+arch cobblestones2
+x 16
+y 15
+end
+arch cobblestones2
+x 16
+y 16
+end
+arch cobblestones2
+x 17
+end
+arch cobblestones2
+x 17
+y 1
+end
+arch woodfloor
+x 17
+y 2
+end
+arch wall_2_1_2
+x 17
+y 2
+end
+arch woodfloor
+x 17
+y 3
+end
+arch woodfloor
+x 17
+y 4
+end
+arch woodfloor
+x 17
+y 4
+end
 arch clock
-x 5
-y 14
-end
-arch woodfloor
-x 5
-y 15
-end
-arch wwall_2_1_2
-x 5
-y 15
-end
-arch woodfloor
-x 6
-end
-arch wwall_3_3
-x 6
-end
-arch woodfloor
-x 6
-y 1
-end
-arch wwall_1_2
-x 6
-y 1
-end
-arch woodfloor
-x 6
-y 2
-end
-arch door_look_2
-x 6
-y 2
-move_block 0
-end
-arch woodfloor
-x 6
-y 3
-end
-arch wwall_1_1
-x 6
-y 3
-end
-arch woodfloor
-x 6
-y 4
-end
-arch wwall_3_2
-x 6
+x 17
 y 4
 end
 arch woodfloor
-x 6
+x 17
 y 5
 end
-arch wwall_1_2
-x 6
+arch wall_2_1_2
+x 17
 y 5
 end
 arch woodfloor
-x 6
-y 6
-end
-arch door_look_2
-x 6
-y 6
-move_block 0
-end
-arch woodfloor
-x 6
-y 7
-end
-arch wwall_2_2_2
-x 6
-y 7
-end
-arch woodfloor
-x 6
-y 8
-end
-arch wwall_1_2
-x 6
-y 8
-end
-arch woodfloor
-x 6
-y 9
-end
-arch door_look_2
-x 6
-y 9
-move_block 0
-end
-arch woodfloor
-x 6
-y 10
-end
-arch wwall_1_4
-x 6
-y 10
-end
-arch woodfloor
-x 6
-y 11
-end
-arch door_look_2
-x 6
-y 11
-move_block 0
-end
-arch woodfloor
-x 6
-y 12
-end
-arch wwall_2_2_3
-x 6
-y 12
-end
-arch woodfloor
-x 6
-y 13
-end
-arch wwall_2_1_1
-x 6
-y 13
-end
-arch woodfloor
-x 6
-y 14
-end
-arch wwall_2_1_1
-x 6
-y 14
-end
-arch woodfloor
-x 6
-y 15
-end
-arch wwall_3_1
-x 6
-y 15
-end
-arch woodfloor
-x 7
-end
-arch wwall_2_1_2
-x 7
-end
-arch woodfloor
-x 7
-y 1
-end
-arch woodfloor
-x 7
-y 2
-end
-arch woodfloor
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch wwall_2_1_2
-x 7
-y 4
-end
-arch woodfloor
-x 7
-y 5
-end
-arch woodfloor
-x 7
+x 17
 y 6
 end
 arch woodfloor
-x 7
+x 17
 y 7
 end
-arch wwall_2_1_2
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
-end
-arch woodfloor
-x 7
-y 9
-end
 arch chair_1.4
-x 7
-y 9
-end
-arch woodfloor
-x 7
-y 10
-end
-arch wwall_2_1_2
-x 7
-y 10
-end
-arch woodfloor
-x 7
-y 11
-end
-arch woodfloor
-x 7
-y 12
-end
-arch woodfloor
-x 7
-y 13
-end
-arch woodfloor
-x 7
-y 14
-end
-arch clock
-x 7
-y 14
-end
-arch woodfloor
-x 7
-y 15
-end
-arch wwall_2_1_2
-x 7
-y 15
-end
-arch woodfloor
-x 8
-end
-arch wwall_2_1_2
-x 8
-end
-arch woodfloor
-x 8
-y 1
-end
-arch chair_1.1
-x 8
-y 1
-end
-arch pirate
-name drunk pirate
-msg
-@match *
-..*hicks*..
-endmsg
-x 8
-y 1
-friendly 1
-end
-arch woodfloor
-x 8
-y 2
-end
-arch woodfloor
-x 8
-y 3
-end
-arch woodfloor
-x 8
-y 4
-end
-arch wwall_2_1_2
-x 8
-y 4
-end
-arch woodfloor
-x 8
-y 5
-end
-arch clock
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch woodfloor
-x 8
-y 7
-end
-arch wwall_2_1_2
-x 8
+x 17
 y 7
 end
 arch woodfloor
-x 8
+x 17
+y 8
+end
+arch wall_2_1_2
+x 17
 y 8
 end
 arch woodfloor
-x 8
+x 17
 y 9
 end
-arch table
-x 8
-y 9
-end
-arch woodfloor
-x 8
-y 10
-end
-arch wwall_2_1_2
-x 8
+arch light4
+x 17
 y 10
 end
 arch woodfloor
-x 8
-y 11
-end
-arch woodfloor
-x 8
-y 12
-end
-arch woodfloor
-x 8
-y 13
-end
-arch woodfloor
-x 8
-y 14
-end
-arch woodfloor
-x 8
-y 15
-end
-arch wwall_2_1_2
-x 8
-y 15
-end
-arch woodfloor
-x 9
-end
-arch wwall_2_1_2
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch table
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 2
-end
-arch woodfloor
-x 9
-y 3
-end
-arch woodfloor
-x 9
-y 4
-end
-arch wwall_2_1_2
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch chair_1.1
-x 9
-y 5
-end
-arch woodfloor
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch wwall_2_1_2
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch chair_1.2
-x 9
-y 9
-end
-arch woodfloor
-x 9
+x 17
 y 10
 end
-arch wwall_2_1_2
-x 9
-y 10
-end
-arch woodfloor
-x 9
-y 11
-end
 arch chair_1.4
-x 9
+x 17
+y 10
+end
+arch woodfloor
+x 17
+y 11
+end
+arch wall_2_1_2
+x 17
 y 11
 end
 arch woodfloor
-x 9
+x 17
 y 12
 end
-arch woodfloor
-x 9
+arch light4
+x 17
 y 13
 end
 arch woodfloor
-x 9
-y 14
+x 17
+y 13
 end
-arch woodfloor
-x 9
-y 15
-end
-arch wwall_2_1_2
-x 9
-y 15
-end
-arch woodfloor
-x 10
-end
-arch wwall_2_1_2
-x 10
-end
-arch woodfloor
-x 10
-y 1
-end
-arch chair_1.1
-x 10
-y 1
-end
-arch woodfloor
-x 10
-y 2
-end
-arch woodfloor
-x 10
-y 3
-end
-arch woodfloor
-x 10
-y 4
-end
-arch wwall_2_1_2
-x 10
-y 4
-end
-arch woodfloor
-x 10
-y 5
-end
-arch table
-x 10
-y 5
-end
-arch woodfloor
-x 10
-y 6
-end
-arch woodfloor
-x 10
-y 7
-end
-arch wwall_2_1_2
-x 10
-y 7
-end
-arch woodfloor
-x 10
-y 8
-end
-arch clock
-x 10
-y 8
-end
-arch woodfloor
-x 10
-y 9
-end
-arch woodfloor
-x 10
-y 10
-end
-arch wwall_2_1_2
-x 10
-y 10
-end
-arch woodfloor
-x 10
-y 11
-end
-arch table
-x 10
-y 11
-end
-arch woodfloor
-x 10
-y 12
-end
-arch woodfloor
-x 10
+arch chair_1.4
+x 17
 y 13
 end
 arch woodfloor
-x 10
+x 17
 y 14
 end
-arch woodfloor
-x 10
+arch wall_2_1_2
+x 17
+y 14
+end
+arch cobblestones2
+x 17
 y 15
 end
-arch wwall_2_1_2
-x 10
-y 15
+arch cobblestones2
+x 17
+y 16
 end
-arch woodfloor
-x 11
+arch cobblestones2
+x 18
 end
-arch wwall_2_1_2
-x 11
-end
-arch woodfloor
-x 11
-y 1
-end
-arch clock
-x 11
+arch cobblestones2
+x 18
 y 1
 end
 arch woodfloor
-x 11
+x 18
+y 2
+end
+arch wall_2_1_2
+x 18
 y 2
 end
 arch woodfloor
-x 11
+x 18
 y 3
 end
-arch woodfloor
-x 11
-y 4
-end
-arch wwall_2_1_2
-x 11
+arch light4
+x 18
 y 4
 end
 arch woodfloor
-x 11
+x 18
+y 4
+end
+arch woodfloor
+x 18
 y 5
 end
-arch chair_1.1
-x 11
+arch wall_2_1_2
+x 18
 y 5
 end
 arch woodfloor
-x 11
+x 18
 y 6
 end
-arch woodfloor
-x 11
-y 7
-end
-arch wwall_2_1_2
-x 11
+arch light4
+x 18
 y 7
 end
 arch woodfloor
-x 11
+x 18
+y 7
+end
+arch table
+x 18
+y 7
+end
+arch woodfloor
+x 18
+y 8
+end
+arch wall_2_1_2
+x 18
 y 8
 end
 arch woodfloor
-x 11
+x 18
 y 9
 end
 arch woodfloor
-x 11
+x 18
 y 10
 end
-arch wwall_2_1_2
-x 11
+arch table
+x 18
 y 10
 end
 arch woodfloor
-x 11
+x 18
 y 11
 end
+arch wall_2_1_2
+x 18
+y 11
+end
+arch woodfloor
+x 18
+y 12
+end
+arch woodfloor
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 14
+end
+arch wall_2_1_2
+x 18
+y 14
+end
+arch cobblestones2
+x 18
+y 15
+end
+arch cobblestones2
+x 18
+y 16
+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 chair_1.2
-x 11
-y 11
+x 19
+y 3
 end
 arch pirate
 name drunk pirate
@@ -1188,251 +1963,588 @@ msg
 @match *
 ..*hicks*..
 endmsg
-x 11
-y 11
+x 19
+y 3
 friendly 1
 end
 arch woodfloor
-x 11
-y 12
-end
-arch woodfloor
-x 11
-y 13
-end
-arch woodfloor
-x 11
-y 14
-end
-arch woodfloor
-x 11
-y 15
-end
-arch wwall_2_1_2
-x 11
-y 15
-end
-arch woodfloor
-x 12
-end
-arch wwall_2_1_2
-x 12
-end
-arch woodfloor
-x 12
-y 1
-end
-arch woodfloor
-x 12
-y 2
-end
-arch woodfloor
-x 12
-y 3
-end
-arch bed_save
-x 12
-y 3
-end
-arch woodfloor
-x 12
-y 4
-end
-arch wwall_2_1_2
-x 12
+x 19
 y 4
 end
 arch woodfloor
-x 12
+x 19
+y 5
+end
+arch wall_2_1_2
+x 19
 y 5
 end
 arch woodfloor
-x 12
-y 6
-end
-arch bed_save
-x 12
+x 19
 y 6
 end
 arch woodfloor
-x 12
-y 7
-end
-arch wwall_2_1_2
-x 12
+x 19
 y 7
 end
 arch woodfloor
-x 12
+x 19
+y 7
+end
+arch clock
+x 19
+y 7
+end
+arch woodfloor
+x 19
+y 8
+end
+arch wall_2_1_2
+x 19
 y 8
 end
 arch woodfloor
-x 12
-y 9
-end
-arch bed_save
-x 12
+x 19
 y 9
 end
 arch woodfloor
-x 12
+x 19
 y 10
 end
-arch wwall_2_1_2
-x 12
+arch chair_1.2
+x 19
 y 10
 end
 arch woodfloor
-x 12
+x 19
+y 11
+end
+arch wall_2_1_2
+x 19
 y 11
 end
 arch woodfloor
-x 12
+x 19
 y 12
 end
+arch chair_1.2
+x 19
+y 12
+end
+arch pirate
+name drunk pirate
+msg
+@match *
+..*hicks*..
+endmsg
+x 19
+y 12
+friendly 1
+end
 arch woodfloor
-x 12
+x 19
 y 13
 end
-arch woodfloor
-x 12
-y 14
-end
-arch bed_save
-x 12
+arch light2
+x 19
 y 14
 end
 arch woodfloor
-x 12
+x 19
+y 14
+end
+arch window_win2
+x 19
+y 14
+end
+arch cobblestones2
+x 19
 y 15
 end
-arch wwall_2_1_2
-x 12
-y 15
+arch cobblestones2
+x 19
+y 16
 end
-arch woodfloor
-x 13
+arch cobblestones2
+x 20
 end
-arch wwall_2_2_3
-x 13
-end
-arch woodfloor
-x 13
-y 1
-end
-arch wwall_2_1_1
-x 13
+arch cobblestones2
+x 20
 y 1
 end
 arch woodfloor
-x 13
+x 20
 y 2
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_2
+x 20
 y 2
 end
-arch woodfloor
-x 13
-y 3
-end
-arch wwall_2_1_1
-x 13
+arch light4
+x 20
 y 3
 end
 arch woodfloor
-x 13
-y 4
+x 20
+y 3
 end
-arch wwall_3_4
-x 13
+arch woodfloor
+x 20
 y 4
 end
 arch woodfloor
-x 13
+x 20
 y 5
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_2
+x 20
 y 5
 end
 arch woodfloor
-x 13
-y 6
-end
-arch wwall_2_1_1
-x 13
+x 20
 y 6
 end
 arch woodfloor
-x 13
-y 7
-end
-arch wwall_3_4
-x 13
+x 20
 y 7
 end
 arch woodfloor
-x 13
+x 20
 y 8
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_2
+x 20
 y 8
 end
 arch woodfloor
-x 13
-y 9
-end
-arch wwall_2_1_1
-x 13
+x 20
 y 9
 end
 arch woodfloor
-x 13
-y 10
-end
-arch wwall_3_4
-x 13
+x 20
 y 10
 end
 arch woodfloor
-x 13
+x 20
 y 11
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_2
+x 20
 y 11
 end
 arch woodfloor
-x 13
-y 12
-end
-arch wwall_2_1_1
-x 13
+x 20
 y 12
 end
 arch woodfloor
-x 13
-y 13
-end
-arch wwall_2_1_1
-x 13
+x 20
 y 13
 end
 arch woodfloor
-x 13
+x 20
 y 14
 end
-arch wwall_2_1_1
-x 13
+arch wall_2_1_2
+x 20
 y 14
 end
+arch cobblestones2
+x 20
+y 15
+end
+arch cobblestones2
+x 20
+y 16
+end
+arch cobblestones2
+x 21
+end
+arch cobblestones2
+x 21
+y 1
+end
 arch woodfloor
-x 13
+x 21
+y 2
+end
+arch wall_2_1_2
+x 21
+y 2
+end
+arch woodfloor
+x 21
+y 3
+end
+arch woodfloor
+x 21
+y 3
+end
+arch bed_save
+x 21
+y 3
+end
+arch woodfloor
+x 21
+y 4
+end
+arch chair_1.2
+x 21
+y 4
+end
+arch woodfloor
+x 21
+y 5
+end
+arch wall_2_1_2
+x 21
+y 5
+end
+arch light4
+x 21
+y 6
+end
+arch woodfloor
+x 21
+y 6
+end
+arch woodfloor
+x 21
+y 7
+end
+arch bed_save
+x 21
+y 7
+end
+arch woodfloor
+x 21
+y 8
+end
+arch wall_2_1_2
+x 21
+y 8
+end
+arch light4
+x 21
+y 9
+end
+arch woodfloor
+x 21
+y 9
+end
+arch woodfloor
+x 21
+y 10
+end
+arch bed_save
+x 21
+y 10
+end
+arch woodfloor
+x 21
+y 11
+end
+arch wall_2_1_2
+x 21
+y 11
+end
+arch light4
+x 21
+y 12
+end
+arch woodfloor
+x 21
+y 12
+end
+arch woodfloor
+x 21
+y 13
+end
+arch bed_save
+x 21
+y 13
+end
+arch woodfloor
+x 21
+y 14
+end
+arch wall_2_1_2
+x 21
+y 14
+end
+arch cobblestones2
+x 21
 y 15
 end
-arch wwall_2_2_4
-x 13
+arch cobblestones2
+x 21
+y 16
+end
+arch cobblestones2
+x 22
+end
+arch cobblestones2
+x 22
+y 1
+end
+arch woodfloor
+x 22
+y 2
+end
+arch wall_2_2_3
+x 22
+y 2
+end
+arch light2
+x 22
+y 3
+end
+arch woodfloor
+x 22
+y 3
+end
+arch window_win1
+x 22
+y 3
+end
+arch woodfloor
+x 22
+y 4
+end
+arch wall_2_1_1
+x 22
+y 4
+end
+arch woodfloor
+x 22
+y 5
+end
+arch wall_3_4
+x 22
+y 5
+end
+arch light2
+x 22
+y 6
+end
+arch woodfloor
+x 22
+y 6
+end
+arch window_win1
+x 22
+y 6
+end
+arch woodfloor
+x 22
+y 7
+end
+arch wall_2_1_1
+x 22
+y 7
+end
+arch woodfloor
+x 22
+y 8
+end
+arch wall_3_4
+x 22
+y 8
+end
+arch light2
+x 22
+y 9
+end
+arch woodfloor
+x 22
+y 9
+end
+arch window_win1
+x 22
+y 9
+end
+arch woodfloor
+x 22
+y 10
+end
+arch wall_2_1_1
+x 22
+y 10
+end
+arch woodfloor
+x 22
+y 11
+end
+arch wall_3_4
+x 22
+y 11
+end
+arch light2
+x 22
+y 12
+end
+arch woodfloor
+x 22
+y 12
+end
+arch window_win1
+x 22
+y 12
+end
+arch woodfloor
+x 22
+y 13
+end
+arch wall_2_1_1
+x 22
+y 13
+end
+arch woodfloor
+x 22
+y 14
+end
+arch wall_2_2_4
+x 22
+y 14
+end
+arch cobblestones2
+x 22
 y 15
 end
+arch cobblestones2
+x 22
+y 16
+end
+arch cobblestones2
+x 23
+end
+arch cobblestones2
+x 23
+y 1
+end
+arch cobblestones2
+x 23
+y 2
+end
+arch cobblestones2
+x 23
+y 3
+end
+arch cobblestones2
+x 23
+y 4
+end
+arch cobblestones2
+x 23
+y 5
+end
+arch cobblestones2
+x 23
+y 6
+end
+arch cobblestones2
+x 23
+y 7
+end
+arch cobblestones2
+x 23
+y 8
+end
+arch cobblestones2
+x 23
+y 9
+end
+arch cobblestones2
+x 23
+y 10
+end
+arch cobblestones2
+x 23
+y 11
+end
+arch cobblestones2
+x 23
+y 12
+end
+arch cobblestones2
+x 23
+y 13
+end
+arch cobblestones2
+x 23
+y 14
+end
+arch cobblestones2
+x 23
+y 15
+end
+arch cobblestones2
+x 23
+y 16
+end
+arch cobblestones2
+x 24
+end
+arch cobblestones2
+x 24
+y 1
+end
+arch cobblestones2
+x 24
+y 2
+end
+arch cobblestones2
+x 24
+y 3
+end
+arch cobblestones2
+x 24
+y 4
+end
+arch cobblestones2
+x 24
+y 5
+end
+arch cobblestones2
+x 24
+y 6
+end
+arch cobblestones2
+x 24
+y 7
+end
+arch cobblestones2
+x 24
+y 8
+end
+arch cobblestones2
+x 24
+y 9
+end
+arch cobblestones2
+x 24
+y 10
+end
+arch cobblestones2
+x 24
+y 11
+end
+arch cobblestones2
+x 24
+y 12
+end
+arch cobblestones2
+x 24
+y 13
+end
+arch cobblestones2
+x 24
+y 14
+end
+arch cobblestones2
+x 24
+y 15
+end
+arch cobblestones2
+x 24
+y 16
+end