diff --git a/port_joseph/town/dshark b/port_joseph/town/dshark
index 97400418f..190e25acf 100644
--- a/port_joseph/town/dshark
+++ b/port_joseph/town/dshark
@@ -2,163 +2,1401 @@ arch map
 name The Drunken Shark
 difficulty 8
 region portjoseph
-width 18
-height 14
+width 23
+height 19
 enter_x 16
 enter_y 6
 msg
 Created:  1994-05-17 langley (langley@fermat.dartmouth.edu)
-Modified: 2011-11-24 Rick Tanner
+Modified: 2011-11-30 Rick Tanner
 endmsg
+outdoor 1
 end
-arch brush
+arch grass_only
 end
-arch tree
-end
-arch brush
+arch grass_only
 y 1
 end
-arch ytree
-y 1
-end
-arch brush
+arch grass_only
 y 2
 end
-arch tree
+arch brush
+y 3
+end
+arch brush
+y 4
+end
+arch brush
+y 5
+end
+arch brush
+y 6
+end
+arch brush
+y 7
+end
+arch brush
+y 8
+end
+arch brush
+y 9
+end
+arch brush
+y 10
+end
+arch brush
+y 11
+end
+arch brush
+y 12
+end
+arch brush
+y 13
+end
+arch brush
+y 14
+end
+arch brush
+y 15
+end
+arch brush
+y 16
+end
+arch brush
+y 17
+end
+arch brush
+y 18
+end
+arch grass_only
+x 1
+end
+arch grass_only
+x 1
+y 1
+end
+arch grass_only
+x 1
+y 2
+end
+arch grass_only
+x 1
+y 3
+end
+arch grass_only
+x 1
+y 4
+end
+arch grass_only
+x 1
+y 5
+end
+arch grass_only
+x 1
+y 6
+end
+arch grass_only
+x 1
+y 7
+end
+arch grass_only
+x 1
+y 8
+end
+arch grass_only
+x 1
+y 9
+end
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch grass_only
+x 1
+y 14
+end
+arch grass_only
+x 1
+y 15
+end
+arch grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch grass_only
+x 2
 y 2
 end
 arch woodfloor
+x 2
 y 3
 end
 arch wwall_2_2_2
+x 2
 y 3
 end
 arch woodfloor
+x 2
 y 4
 end
 arch wwall_2_1_1
+x 2
 y 4
 end
 arch woodfloor
+x 2
 y 5
 end
 arch wwall_2_1_1
+x 2
 y 5
 end
 arch woodfloor
+x 2
 y 6
 end
+arch wwall_2_1_1
+x 2
+y 6
+end
+arch woodfloor
+x 2
+y 7
+end
+arch wwall_2_1_1
+x 2
+y 7
+end
+arch woodfloor
+x 2
+y 8
+end
 arch wwall_3_2
-y 6
-end
-arch woodfloor
-y 7
-end
-arch wwall_2_1_1
-y 7
-end
-arch woodfloor
+x 2
 y 8
 end
-arch wwall_2_1_1
-y 8
-end
-arch woodfloor
-y 9
-end
-arch wwall_2_1_1
+arch light2
+x 2
 y 9
 end
 arch woodfloor
+x 2
+y 9
+end
+arch wwall_win1
+x 2
+y 9
+end
+arch woodfloor
+x 2
 y 10
 end
 arch wwall_2_1_1
+x 2
 y 10
 end
 arch woodfloor
+x 2
 y 11
 end
 arch wwall_2_1_1
+x 2
 y 11
 end
 arch woodfloor
+x 2
 y 12
 end
 arch wwall_2_1_1
+x 2
 y 12
 end
 arch woodfloor
+x 2
 y 13
 end
+arch wwall_2_1_1
+x 2
+y 13
+end
+arch woodfloor
+x 2
+y 14
+end
+arch wwall_2_1_1
+x 2
+y 14
+end
+arch woodfloor
+x 2
+y 15
+end
+arch wwall_2_1_1
+x 2
+y 15
+end
+arch woodfloor
+x 2
+y 16
+end
 arch wwall_2_2_1
-y 13
+x 2
+y 16
 end
-arch brush
-x 1
+arch grass_only
+x 2
+y 17
 end
-arch evergreen
-x 1
+arch pstone_2
+x 2
+y 18
 end
-arch brush
-x 1
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
 y 1
 end
-arch brush
-x 1
+arch grass_only
+x 3
 y 2
 end
 arch woodfloor
-x 1
+x 3
 y 3
 end
 arch wwall_2_1_2
-x 1
+x 3
 y 3
 end
 arch woodfloor
-x 1
+x 3
 y 4
 end
 arch clock
-x 1
+x 3
 y 4
 end
 arch woodfloor
-x 1
+x 3
 y 5
 end
 arch chair
-x 1
+x 3
 y 5
 end
 arch woodfloor
-x 1
-y 6
-end
-arch wwall_2_1_2
-x 1
+x 3
 y 6
 end
 arch woodfloor
-x 1
+x 3
 y 7
 end
 arch woodfloor
-x 1
+x 3
+y 8
+end
+arch wwall_2_1_2
+x 3
 y 8
 end
 arch woodfloor
-x 1
+x 3
+y 9
+end
+arch booze
+x 3
 y 9
 end
 arch woodfloor
-x 1
+x 3
 y 10
 end
 arch woodfloor
-x 1
+x 3
 y 11
 end
+arch bench_1_4
+x 3
+y 11
+move_block walk swim boat
+end
+arch woodfloor
+x 3
+y 12
+end
+arch chair
+x 3
+y 12
+end
+arch woman
+name Drunk woman
+msg
+@match *
+Won'tcha buy a girl a drink? >hic<
+endmsg
+x 3
+y 12
+end
+arch woodfloor
+x 3
+y 13
+end
+arch woodfloor
+x 3
+y 14
+end
+arch woodfloor
+x 3
+y 15
+end
+arch chair
+x 3
+y 15
+end
+arch vampire
+name mysterious stranger
+msg
+@match treasure
+I don't know anything, ask them . . .
+@match *
+Pssst.
+I overheard those two in the next booth whispering about treasure.
+endmsg
+hp 30
+maxhp 30
+sp 5
+maxsp 5
+exp 150
+x 3
+y 15
+level 5
+unaggressive 1
+end
+arch woodfloor
+x 3
+y 16
+end
+arch wwall_2_1_2
+x 3
+y 16
+end
+arch pstone_2
+x 3
+y 17
+end
+arch pstone_2
+x 3
+y 18
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch grass_only
+x 4
+y 2
+end
+arch light2
+x 4
+y 3
+end
+arch woodfloor
+x 4
+y 3
+end
+arch wwall_win2
+x 4
+y 3
+end
+arch woodfloor
+x 4
+y 4
+end
+arch woodfloor
+x 4
+y 5
+end
+arch table_3
+x 4
+y 5
+end
+arch light4
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 6
+end
+arch woodfloor
+x 4
+y 7
+end
+arch barrel
+x 4
+y 7
+end
+arch woodfloor
+x 4
+y 8
+end
+arch wwall_2_1_2
+x 4
+y 8
+end
+arch woodfloor
+x 4
+y 9
+end
+arch booze
+x 4
+y 9
+end
+arch woodfloor
+x 4
+y 10
+end
+arch woodfloor
+x 4
+y 11
+end
+arch bench_2_1_2
+x 4
+y 11
+move_block walk swim boat
+end
+arch woodfloor
+x 4
+y 12
+end
+arch woodfloor
+x 4
+y 13
+end
+arch woodfloor
+x 4
+y 14
+end
+arch chair_1.1
+x 4
+y 14
+end
+arch woodfloor
+x 4
+y 15
+end
+arch table_4
+x 4
+y 15
+end
+arch woodfloor
+x 4
+y 16
+end
+arch wwall_2_1_2
+x 4
+y 16
+end
+arch pstone_2
+x 4
+y 17
+end
+arch pstone_2
+x 4
+y 18
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
+y 1
+end
+arch grass_only
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch wwall_2_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 woodfloor
+x 5
+y 7
+end
+arch barrel
+x 5
+y 7
+end
+arch woodfloor
+x 5
+y 8
+end
+arch wwall_2_1_2
+x 5
+y 8
+end
+arch woodfloor
+x 5
+y 9
+end
+arch barrel
+x 5
+y 9
+end
+arch woodfloor
+x 5
+y 10
+end
+arch man
+name bartender
+hp 25
+maxhp 25
+exp 75
+dam 8
+x 5
+y 10
+monster 0
+friendly 1
+stand_still 1
+end
+arch light4
+x 5
+y 11
+end
+arch woodfloor
+x 5
+y 11
+end
+arch bench_2_1_2
+x 5
+y 11
+move_block walk swim boat
+end
+arch woodfloor
+x 5
+y 12
+end
+arch chair
+x 5
+y 12
+end
+arch woodfloor
+x 5
+y 13
+end
+arch light4
+x 5
+y 14
+end
+arch woodfloor
+x 5
+y 14
+end
+arch woodfloor
+x 5
+y 15
+end
+arch chair_1.2
+x 5
+y 15
+end
+arch woodfloor
+x 5
+y 16
+end
+arch wwall_2_1_2
+x 5
+y 16
+end
+arch pstone_2
+x 5
+y 17
+end
+arch pstone_2
+x 5
+y 18
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch grass_only
+x 6
+y 2
+end
+arch woodfloor
+x 6
+y 3
+end
+arch wwall_2_1_2
+x 6
+y 3
+end
+arch woodfloor
+x 6
+y 4
+end
+arch charwoman
+x 6
+y 4
+end
+arch woodfloor
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch pirate
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
+arch barrel
+x 6
+y 7
+end
+arch woodfloor
+x 6
+y 8
+end
+arch wwall_2_1_2
+x 6
+y 8
+end
+arch woodfloor
+x 6
+y 9
+end
+arch barrel
+x 6
+y 9
+end
+arch woodfloor
+x 6
+y 10
+end
+arch woodfloor
+x 6
+y 11
+end
+arch bench_2_1_2
+x 6
+y 11
+move_block walk swim boat
+end
+arch woodfloor
+x 6
+y 12
+end
+arch woodfloor
+x 6
+y 13
+end
+arch woodfloor
+x 6
+y 14
+end
+arch woodfloor
+x 6
+y 15
+end
+arch light2
+x 6
+y 16
+end
+arch woodfloor
+x 6
+y 16
+end
+arch wwall_win2
+x 6
+y 16
+end
+arch pstone_2
+x 6
+y 17
+end
+arch pstone_2
+x 6
+y 18
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch grass_only
+x 7
+y 2
+end
+arch woodfloor
+x 7
+y 3
+end
+arch wwall_2_1_2
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch chest
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
+arch light4
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 6
+end
+arch woodfloor
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch wwall_2_1_2
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
+arch booze
+x 7
+y 9
+end
+arch woodfloor
+x 7
+y 10
+end
+arch woodfloor
+x 7
+y 11
+end
+arch bench_2_1_2
+x 7
+y 11
+move_block walk swim boat
+end
+arch woodfloor
+x 7
+y 12
+end
+arch woodfloor
+x 7
+y 13
+end
+arch woman2
+name serving girl
+msg
+@match drink
+Hold your horses, I'll get your drinks when I'm good and ready.
+@match *
+Set yerself down at a table and I'll take your order.
+endmsg
+x 7
+y 13
+random_movement 1
+end
+arch woodfloor
+x 7
+y 14
+end
+arch woodfloor
+x 7
+y 15
+end
+arch chair_1.1
+x 7
+y 15
+end
+arch woodfloor
+x 7
+y 16
+end
+arch wwall_2_1_2
+x 7
+y 16
+end
+arch pstone_2
+x 7
+y 17
+end
+arch pstone_2
+x 7
+y 18
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch grass_only
+x 8
+y 2
+end
+arch woodfloor
+x 8
+y 3
+end
+arch wwall_2_1_2
+x 8
+y 3
+end
+arch woodfloor
+x 8
+y 4
+end
+arch chest
+x 8
+y 4
+end
+arch light4
+x 8
+y 5
+end
+arch woodfloor
+x 8
+y 5
+end
+arch woodfloor
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
+arch woodfloor
+x 8
+y 8
+end
+arch wwall_1_3
+x 8
+y 8
+end
+arch woodfloor
+x 8
+y 9
+end
+arch bench_1_1
+x 8
+y 9
+move_block walk swim boat
+end
+arch woodfloor
+x 8
+y 10
+end
+arch bench_2_1_1
+x 8
+y 10
+move_block walk swim boat
+end
+arch light4
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 11
+end
+arch bench_2_2_4
+x 8
+y 11
+move_block walk swim boat
+end
+arch woodfloor
+x 8
+y 12
+end
+arch woodfloor
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch chair_1.1
+x 8
+y 14
+end
+arch warrior_1
+msg
+@match *
+>hiccup<
+endmsg
+x 8
+y 14
+end
+arch woodfloor
+x 8
+y 15
+end
+arch table_4
+x 8
+y 15
+end
+arch woodfloor
+x 8
+y 16
+end
+arch wwall_2_1_2
+x 8
+y 16
+end
+arch pstone_2
+x 8
+y 17
+end
+arch pstone_2
+x 8
+y 18
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch grass_only
+x 9
+y 2
+end
+arch woodfloor
+x 9
+y 3
+end
+arch wwall_2_1_2
+x 9
+y 3
+end
+arch woodfloor
+x 9
+y 4
+end
+arch woodfloor
+x 9
+y 5
+end
+arch woman
+x 9
+y 5
+unaggressive 0
+end
+arch woodfloor
+x 9
+y 6
+end
+arch woodfloor
+x 9
+y 7
+end
+arch woodfloor
+x 9
+y 8
+end
+arch door_look_1
+x 9
+y 8
+end
+arch woodfloor
+x 9
+y 9
+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 light4
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 15
+end
+arch chair_1.2
+x 9
+y 15
+end
+arch woodfloor
+x 9
+y 16
+end
+arch wwall_2_1_2
+x 9
+y 16
+end
+arch pstone_2
+x 9
+y 17
+end
+arch pstone_2
+x 9
+y 18
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch grass_only
+x 10
+y 2
+end
+arch light2
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 3
+end
+arch wwall_win2
+x 10
+y 3
+end
+arch woodfloor
+x 10
+y 4
+end
+arch woodfloor
+x 10
+y 5
+end
+arch light4
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 6
+end
+arch woodfloor
+x 10
+y 7
+end
+arch woodfloor
+x 10
+y 8
+end
+arch wwall_1_4
+x 10
+y 8
+end
+arch woodfloor
+x 10
+y 9
+end
+arch woodfloor
+x 10
+y 10
+end
+arch light4
+x 10
+y 11
+end
+arch woodfloor
+x 10
+y 11
+end
+arch woodfloor
+x 10
+y 12
+end
+arch woodfloor
+x 10
+y 13
+end
+arch woodfloor
+x 10
+y 14
+end
+arch woodfloor
+x 10
+y 15
+end
+arch woodfloor
+x 10
+y 16
+end
+arch wwall_2_1_2
+x 10
+y 16
+end
+arch pstone_2
+x 10
+y 17
+end
+arch pstone_2
+x 10
+y 18
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch grass_only
+x 11
+y 2
+end
+arch woodfloor
+x 11
+y 3
+end
+arch wwall_2_1_2
+x 11
+y 3
+end
+arch woodfloor
+x 11
+y 4
+end
+arch door_look_2
+x 11
+y 4
+end
+arch woodfloor
+x 11
+y 5
+end
+arch wwall_1_1
+x 11
+y 5
+end
+arch woodfloor
+x 11
+y 6
+end
+arch wwall_2_1_1
+x 11
+y 6
+end
+arch woodfloor
+x 11
+y 7
+end
+arch wwall_2_1_1
+x 11
+y 7
+end
+arch woodfloor
+x 11
+y 8
+end
+arch wwall_3_4
+x 11
+y 8
+end
+arch woodfloor
+x 11
+y 9
+end
+arch wwall_2_1_1
+x 11
+y 9
+end
+arch woodfloor
+x 11
+y 10
+end
+arch wwall_2_1_1
+x 11
+y 10
+end
+arch woodfloor
+x 11
+y 11
+end
+arch wwall_2_2_1
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
+arch chair_1.1
+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 light2
+x 11
+y 16
+end
+arch woodfloor
+x 11
+y 16
+end
+arch wwall_win2
+x 11
+y 16
+end
+arch pstone_2
+x 11
+y 17
+end
+arch pstone_2
+x 11
+y 18
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch grass_only
+x 12
+y 2
+end
+arch woodfloor
+x 12
+y 3
+end
+arch wwall_2_1_2
+x 12
+y 3
+end
+arch light4
+x 12
+y 4
+end
+arch woodfloor
+x 12
+y 4
+end
+arch woodfloor
+x 12
+y 5
+end
+arch woodfloor
+x 12
+y 6
+end
+arch woodfloor
+x 12
+y 7
+end
+arch woodfloor
+x 12
+y 8
+end
+arch woodfloor
+x 12
+y 9
+end
 arch thief_1
 name thief
 msg
@@ -169,185 +1407,223 @@ Yeah, the fight.  What are you, stupid?
 @match *
 Why don't you mind your own business and watch the fight?
 endmsg
-x 1
-y 11
+x 12
+y 9
 unaggressive 1
 end
 arch woodfloor
-x 1
+x 12
+y 10
+end
+arch woodfloor
+x 12
+y 11
+end
+arch wwall_2_1_2
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
+arch table_4
+x 12
 y 12
 end
 arch woodfloor
-x 1
+x 12
 y 13
 end
+arch woodfloor
+x 12
+y 14
+end
+arch woodfloor
+x 12
+y 15
+end
+arch woodfloor
+x 12
+y 16
+end
 arch wwall_2_1_2
-x 1
-y 13
+x 12
+y 16
 end
-arch brush
-x 2
+arch pstone_2
+x 12
+y 17
 end
-arch jungle_1
-x 2
+arch pstone_2
+x 12
+y 18
 end
-arch brush
-x 2
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
-arch jungle_1
-x 2
-y 1
-end
-arch brush
-x 2
+arch grass_only
+x 13
 y 2
 end
 arch woodfloor
-x 2
+x 13
 y 3
 end
-arch wwall_win2
-x 2
+arch wwall_2_1_2
+x 13
 y 3
 end
 arch woodfloor
-x 2
+x 13
 y 4
 end
 arch woodfloor
-x 2
-y 5
-end
-arch table_3
-x 2
+x 13
 y 5
 end
 arch woodfloor
-x 2
+x 13
 y 6
 end
-arch wwall_2_1_2
-x 2
-y 6
-end
-arch woodfloor
-x 2
-y 7
-end
-arch woodfloor
-x 2
-y 8
-end
 arch thief_1
 name thief
-x 2
-y 8
+x 13
+y 6
 unaggressive 1
 end
 arch woodfloor
-x 2
-y 9
+x 13
+y 7
 end
 arch elf_1
 msg
 @match *
 He dances like a moonbeam on a golden summer evening.
 endmsg
-x 2
-y 9
+x 13
+y 7
 end
 arch woodfloor
-x 2
-y 10
+x 13
+y 8
 end
 arch northman
 msg
 @match *
 Show your stuff Olaf!
 endmsg
-x 2
-y 10
+x 13
+y 8
 unaggressive 1
 end
 arch woodfloor
-x 2
+x 13
+y 9
+end
+arch woodfloor
+x 13
+y 10
+end
+arch woodfloor
+x 13
+y 11
+end
+arch wwall_2_1_2
+x 13
 y 11
 end
 arch woodfloor
-x 2
+x 13
+y 12
+end
+arch chair_1.2
+x 13
 y 12
 end
 arch woodfloor
-x 2
+x 13
 y 13
 end
+arch light4
+x 13
+y 14
+end
+arch woodfloor
+x 13
+y 14
+end
+arch button_small
+x 13
+y 15
+connected 1
+end
+arch woodfloor
+x 13
+y 15
+end
+arch woodfloor
+x 13
+y 16
+end
+arch wwall_1_3
+x 13
+y 16
+end
+arch invis_exit
+slaying ../../world/world_101_114
+hp 12
+sp 43
+x 13
+y 17
+end
+arch pstone_2
+x 13
+y 17
+end
+arch pstone_2
+x 13
+y 18
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch grass_only
+x 14
+y 2
+end
+arch woodfloor
+x 14
+y 3
+end
 arch wwall_2_1_2
-x 2
-y 13
-end
-arch woodfloor
-x 3
-end
-arch wwall_2_2_2
-x 3
-end
-arch woodfloor
-x 3
-y 1
-end
-arch wwall_win1
-x 3
-y 1
-end
-arch woodfloor
-x 3
-y 2
-end
-arch wwall_2_1_1
-x 3
-y 2
-end
-arch woodfloor
-x 3
-y 3
-end
-arch wwall_2_2_4
-x 3
+x 14
 y 3
 end
 arch woodfloor
-x 3
+x 14
 y 4
 end
 arch woodfloor
-x 3
+x 14
 y 5
 end
-arch wwall_2_2_2
-x 3
-y 5
-end
-arch woodfloor
-x 3
-y 6
-end
-arch wwall_2_2_4
-x 3
-y 6
-end
-arch woodfloor
-x 3
-y 7
-end
 arch gnoll
-x 3
-y 7
+x 14
+y 5
 unaggressive 1
 end
 arch woodfloor
-x 3
-y 8
+x 14
+y 6
 end
 arch pirate
 name Redeye
@@ -366,215 +1642,279 @@ Moogly Bill was a terror to peaceful folk.  He took his secrets to his grave, an
 @match *
 What are ye babbling about?
 endmsg
-x 3
-y 8
+x 14
+y 6
 unaggressive 1
 end
 arch woodfloor
-x 3
-y 9
+x 14
+y 7
 end
 arch warrior_1
-x 3
+x 14
+y 7
+end
+arch woodfloor
+x 14
+y 8
+end
+arch warrior_1
+x 14
+y 8
+end
+arch light4
+x 14
 y 9
 end
 arch woodfloor
-x 3
-y 10
-end
-arch warrior_1
-x 3
-y 10
-end
-arch woodfloor
-x 3
-y 11
+x 14
+y 9
 end
 arch woman
 msg
 @match *
 Rip his head off
 endmsg
-x 3
+x 14
+y 9
+end
+arch woodfloor
+x 14
+y 10
+end
+arch woodfloor
+x 14
+y 11
+end
+arch wwall_2_1_2
+x 14
 y 11
 end
 arch woodfloor
-x 3
+x 14
 y 12
 end
 arch woodfloor
-x 3
-y 13
-end
-arch wwall_2_1_2
-x 3
+x 14
 y 13
 end
 arch woodfloor
-x 4
+x 14
+y 14
 end
-arch wwall_2_1_2
-x 4
+arch button_small
+x 14
+y 15
+connected 1
 end
 arch woodfloor
-x 4
-y 1
+x 14
+y 15
 end
-arch charwoman
-x 4
-y 1
+arch button_small
+x 14
+y 16
+connected 1
 end
 arch woodfloor
-x 4
+x 14
+y 16
+end
+arch odoorn2_closed_1
+x 14
+y 16
+connected 1
+end
+arch invis_exit
+slaying ../../world/world_101_114
+hp 12
+sp 43
+x 14
+y 17
+end
+arch pstone_2
+x 14
+y 17
+end
+arch pstone_2
+x 14
+y 18
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch grass_only
+x 15
 y 2
 end
 arch woodfloor
-x 4
+x 15
 y 3
 end
-arch pirate
-x 4
-y 3
-end
-arch woodfloor
-x 4
-y 4
-end
-arch woodfloor
-x 4
-y 5
-end
 arch wwall_2_1_2
-x 4
-y 5
+x 15
+y 3
 end
 arch woodfloor
-x 4
-y 6
+x 15
+y 4
 end
 arch gnoll
 msg
 @match *
 Phurga
 endmsg
-x 4
-y 6
+x 15
+y 4
 unaggressive 1
 end
 arch woodfloor
-x 4
-y 7
+x 15
+y 5
 end
 arch gnoll
-x 4
-y 7
+x 15
+y 5
 unaggressive 1
 end
 arch pstone_2
-x 4
+x 15
+y 6
+end
+arch pstone_2
+x 15
+y 7
+end
+arch pstone_2
+x 15
 y 8
 end
-arch pstone_2
-x 4
-y 9
-end
-arch pstone_2
-x 4
-y 10
-end
 arch northman
-x 4
-y 10
+x 15
+y 8
 unaggressive 1
 random_movement 1
 end
 arch woodfloor
-x 4
-y 11
+x 15
+y 9
 end
 arch pirate
 msg
 @match *
 Yo ho! Did ye see that punch!
 endmsg
-x 4
-y 11
+x 15
+y 9
 unaggressive 1
 end
 arch woodfloor
-x 4
-y 12
-end
-arch woodfloor
-x 4
-y 13
-end
-arch wwall_2_1_2
-x 4
-y 13
-end
-arch woodfloor
-x 5
-end
-arch wwall_2_1_2
-x 5
-end
-arch woodfloor
-x 5
-y 1
-end
-arch chest
-x 5
-y 1
-end
-arch woodfloor
-x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch woodfloor
-x 5
-y 4
-end
-arch woodfloor
-x 5
-y 5
-end
-arch wwall_2_1_2
-x 5
-y 5
-end
-arch woodfloor
-x 5
-y 6
-end
-arch woodfloor
-x 5
-y 7
-end
-arch woman
-x 5
-y 7
-end
-arch pstone_2
-x 5
-y 8
-end
-arch pstone_2
-x 5
-y 9
-end
-arch pstone_2
-x 5
+x 15
 y 10
 end
 arch woodfloor
-x 5
+x 15
 y 11
 end
+arch wwall_2_1_2
+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 button_small
+x 15
+y 15
+connected 1
+end
+arch woodfloor
+x 15
+y 15
+end
+arch woodfloor
+x 15
+y 16
+end
+arch wwall_1_4
+x 15
+y 16
+end
+arch invis_exit
+slaying ../../world/world_101_114
+hp 12
+sp 43
+x 15
+y 17
+end
+arch pstone_2
+x 15
+y 17
+end
+arch pstone_2
+x 15
+y 18
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch grass_only
+x 16
+y 2
+end
+arch woodfloor
+x 16
+y 3
+end
+arch wwall_2_1_2
+x 16
+y 3
+end
+arch woodfloor
+x 16
+y 4
+end
+arch woodfloor
+x 16
+y 5
+end
+arch woman
+x 16
+y 5
+end
+arch pstone_2
+x 16
+y 6
+end
+arch pstone_2
+x 16
+y 7
+end
+arch pstone_2
+x 16
+y 8
+end
+arch woodfloor
+x 16
+y 9
+end
 arch pirate
 msg
 @match redeye
@@ -582,502 +1922,151 @@ Heh, he's me mate oer in the corner.
 @match *
 Arrr!  Get him ye landlubber!
 endmsg
-x 5
-y 11
+x 16
+y 9
 unaggressive 1
 end
 arch woodfloor
-x 5
+x 16
+y 10
+end
+arch woodfloor
+x 16
+y 11
+end
+arch wwall_1_3
+x 16
+y 11
+end
+arch woodfloor
+x 16
 y 12
 end
 arch woodfloor
-x 5
-y 13
-end
-arch wwall_2_1_2
-x 5
+x 16
 y 13
 end
 arch woodfloor
-x 6
+x 16
+y 14
+end
+arch woodfloor
+x 16
+y 15
+end
+arch woodfloor
+x 16
+y 16
 end
 arch wwall_2_1_2
-x 6
+x 16
+y 16
 end
-arch woodfloor
-x 6
+arch pstone_2
+x 16
+y 17
+end
+arch pstone_2
+x 16
+y 18
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
 y 1
 end
-arch chest
-x 6
-y 1
-end
-arch woodfloor
-x 6
+arch grass_only
+x 17
 y 2
 end
 arch woodfloor
-x 6
+x 17
+y 3
+end
+arch wwall_2_1_2
+x 17
 y 3
 end
 arch woodfloor
-x 6
+x 17
 y 4
 end
 arch woodfloor
-x 6
+x 17
 y 5
 end
-arch wwall_1_3
-x 6
-y 5
-end
-arch woodfloor
-x 6
-y 6
-end
-arch woodfloor
-x 6
-y 7
-end
 arch dwarf
-x 6
-y 7
+x 17
+y 5
 end
 arch pstone_2
-x 6
-y 8
+x 17
+y 6
 end
 arch ogre
-x 6
-y 8
+x 17
+y 6
 unaggressive 1
 random_movement 1
 end
 arch pstone_2
-x 6
-y 9
+x 17
+y 7
 end
 arch pstone_2
-x 6
-y 10
+x 17
+y 8
 end
 arch woodfloor
-x 6
-y 11
+x 17
+y 9
 end
 arch kobold
 msg
 @match *
 froop froop froop froop
 endmsg
-x 6
-y 11
+x 17
+y 9
 unaggressive 1
 end
 arch woodfloor
-x 6
-y 12
+x 17
+y 10
 end
 arch woodfloor
-x 6
-y 13
-end
-arch wwall_2_1_2
-x 6
-y 13
-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 woman
-x 7
-y 2
-unaggressive 0
-end
-arch woodfloor
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch woodfloor
-x 7
-y 5
+x 17
+y 11
 end
 arch door_look_1
-x 7
-y 5
-end
-arch woodfloor
-x 7
-y 6
-end
-arch woodfloor
-x 7
-y 7
-end
-arch dwarf
-msg
-@match *
-Hurmm
-endmsg
-x 7
-y 7
-end
-arch woodfloor
-x 7
-y 8
-end
-arch man
-msg
-@match *
-Get him! Get him!
-endmsg
-x 7
-y 8
-end
-arch woodfloor
-x 7
-y 9
-end
-arch man
-msg
-@match fight
-Yeah, now stop bothering me.
-@match *
-What a fight
-endmsg
-x 7
-y 9
-end
-arch woodfloor
-x 7
-y 10
-end
-arch kobold
-msg
-@match *
-Gblk flbl mgl
-endmsg
-x 7
-y 10
-unaggressive 1
-end
-arch woodfloor
-x 7
-y 11
-end
-arch kobold
-msg
-@match *
-hmbl grbll slind
-endmsg
-x 7
-y 11
-unaggressive 1
-end
-arch woodfloor
-x 7
-y 12
-end
-arch woodfloor
-x 7
-y 13
-end
-arch wwall_2_1_2
-x 7
-y 13
-end
-arch woodfloor
-x 8
-end
-arch wwall_2_1_2
-x 8
-end
-arch woodfloor
-x 8
-y 1
-end
-arch woodfloor
-x 8
-y 2
-end
-arch barrel
-x 8
-y 2
-end
-arch woodfloor
-x 8
-y 3
-end
-arch barrel
-x 8
-y 3
-end
-arch woodfloor
-x 8
-y 4
-end
-arch barrel
-x 8
-y 4
-end
-arch woodfloor
-x 8
-y 5
-end
-arch wwall_1_4
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch woodfloor
-x 8
-y 7
-end
-arch woodfloor
-x 8
-y 8
-end
-arch woodfloor
-x 8
-y 9
-end
-arch woodfloor
-x 8
-y 10
-end
-arch woodfloor
-x 8
+x 17
 y 11
 end
 arch woodfloor
-x 8
-y 12
-end
-arch kobold
-msg
-@match *
-Glbk blgrd orgn
-endmsg
-x 8
-y 12
-unaggressive 1
-end
-arch woodfloor
-x 8
-y 13
-end
-arch wwall_2_1_2
-x 8
-y 13
-end
-arch woodfloor
-x 9
-end
-arch wwall_2_1_2
-x 9
-end
-arch woodfloor
-x 9
-y 1
-end
-arch door_look_2
-x 9
-y 1
-end
-arch woodfloor
-x 9
-y 2
-end
-arch wwall_1_1
-x 9
-y 2
-end
-arch woodfloor
-x 9
-y 3
-end
-arch wwall_2_1_1
-x 9
-y 3
-end
-arch woodfloor
-x 9
-y 4
-end
-arch wwall_2_1_1
-x 9
-y 4
-end
-arch woodfloor
-x 9
-y 5
-end
-arch wwall_3_4
-x 9
-y 5
-end
-arch woodfloor
-x 9
-y 6
-end
-arch wwall_1_2
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch door_look_2
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch wwall_1_1
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch wwall_2_1_1
-x 9
-y 9
-end
-arch woodfloor
-x 9
-y 10
-end
-arch wwall_2_1_1
-x 9
-y 10
-end
-arch woodfloor
-x 9
-y 11
-end
-arch wwall_2_1_1
-x 9
-y 11
-end
-arch woodfloor
-x 9
-y 12
-end
-arch wwall_2_1_1
-x 9
+x 17
 y 12
 end
 arch woodfloor
-x 9
+x 17
 y 13
 end
-arch wwall_3_1
-x 9
-y 13
+arch light4
+x 17
+y 14
 end
 arch woodfloor
-x 10
-end
-arch wwall_2_1_2
-x 10
+x 17
+y 14
 end
 arch woodfloor
-x 10
-y 1
-end
-arch woodfloor
-x 10
-y 2
-end
-arch woodfloor
-x 10
-y 3
-end
-arch bench_1_4
-x 10
-y 3
-move_block walk swim boat
-end
-arch woodfloor
-x 10
-y 4
+x 17
+y 15
 end
 arch chair
-x 10
-y 4
-end
-arch woman
-name Drunk woman
-msg
-@match *
-Won'tcha buy a girl a drink? >hic<
-endmsg
-x 10
-y 4
-end
-arch woodfloor
-x 10
-y 5
-end
-arch woodfloor
-x 10
-y 6
-end
-arch woodfloor
-x 10
-y 7
-end
-arch woodfloor
-x 10
-y 8
-end
-arch chair_1.1
-x 10
-y 8
-end
-arch woodfloor
-x 10
-y 9
-end
-arch woodfloor
-x 10
-y 10
-end
-arch woodfloor
-x 10
-y 11
-end
-arch woodfloor
-x 10
-y 12
-end
-arch chair
-x 10
-y 12
+x 17
+y 15
 end
 arch thief_1
 name thief
@@ -1089,193 +2078,269 @@ Yes, he was buried with his treasure map. Only Pegleg Percival knows where.
 @match redeye
 Redeye is in the back room watching the fight. He's the ugly one.
 endmsg
-x 10
+x 17
+y 15
+unaggressive 1
+end
+arch woodfloor
+x 17
+y 16
+end
+arch wwall_2_1_2
+x 17
+y 16
+end
+arch pstone_2
+x 17
+y 17
+end
+arch pstone_2
+x 17
+y 18
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
+end
+arch grass_only
+x 18
+y 2
+end
+arch woodfloor
+x 18
+y 3
+end
+arch wwall_2_1_2
+x 18
+y 3
+end
+arch light4
+x 18
+y 4
+end
+arch woodfloor
+x 18
+y 4
+end
+arch woodfloor
+x 18
+y 5
+end
+arch dwarf
+msg
+@match *
+Hurmm
+endmsg
+x 18
+y 5
+end
+arch woodfloor
+x 18
+y 6
+end
+arch man
+msg
+@match *
+Get him! Get him!
+endmsg
+x 18
+y 6
+end
+arch woodfloor
+x 18
+y 7
+end
+arch man
+msg
+@match fight
+Yeah, now stop bothering me.
+@match *
+What a fight
+endmsg
+x 18
+y 7
+end
+arch woodfloor
+x 18
+y 8
+end
+arch kobold
+msg
+@match *
+Gblk flbl mgl
+endmsg
+x 18
+y 8
+unaggressive 1
+end
+arch light4
+x 18
+y 9
+end
+arch woodfloor
+x 18
+y 9
+end
+arch kobold
+msg
+@match *
+hmbl grbll slind
+endmsg
+x 18
+y 9
+unaggressive 1
+end
+arch woodfloor
+x 18
+y 10
+end
+arch woodfloor
+x 18
+y 11
+end
+arch wwall_1_4
+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 chair_1.1
+x 18
+y 14
+end
+arch woodfloor
+x 18
+y 15
+end
+arch table_4
+x 18
+y 15
+end
+arch woodfloor
+x 18
+y 16
+end
+arch wwall_2_1_2
+x 18
+y 16
+end
+arch pstone_2
+x 18
+y 17
+end
+arch pstone_2
+x 18
+y 18
+end
+arch cobblestones2
+x 19
+end
+arch cobblestones2
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch woodfloor
+x 19
+y 3
+end
+arch wwall_2_1_2
+x 19
+y 3
+end
+arch woodfloor
+x 19
+y 4
+end
+arch woodfloor
+x 19
+y 5
+end
+arch woodfloor
+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 woodfloor
+x 19
+y 10
+end
+arch kobold
+msg
+@match *
+Glbk blgrd orgn
+endmsg
+x 19
+y 10
+unaggressive 1
+end
+arch woodfloor
+x 19
+y 11
+end
+arch wwall_2_1_2
+x 19
+y 11
+end
+arch woodfloor
+x 19
+y 12
+end
+arch chair_1.2
+x 19
+y 12
+end
+arch gnoll
+msg
+@match *
+Keep away from me, yer stinking up the bar.
+endmsg
+x 19
 y 12
 unaggressive 1
 end
 arch woodfloor
-x 10
-y 13
-end
-arch wwall_2_1_2
-x 10
+x 19
 y 13
 end
 arch woodfloor
-x 11
-end
-arch wwall_2_1_2
-x 11
+x 19
+y 14
 end
 arch woodfloor
-x 11
-y 1
-end
-arch booze
-x 11
-y 1
-end
-arch woodfloor
-x 11
-y 2
-end
-arch woodfloor
-x 11
-y 3
-end
-arch bench_2_1_2
-x 11
-y 3
-move_block walk swim boat
-end
-arch woodfloor
-x 11
-y 4
-end
-arch woodfloor
-x 11
-y 5
-end
-arch woodfloor
-x 11
-y 6
-end
-arch chair_1.1
-x 11
-y 6
-end
-arch woodfloor
-x 11
-y 7
-end
-arch woodfloor
-x 11
-y 8
-end
-arch table_4
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
-end
-arch woodfloor
-x 11
-y 10
-end
-arch woodfloor
-x 11
-y 11
-end
-arch chair_1.1
-x 11
-y 11
-end
-arch woodfloor
-x 11
-y 12
-end
-arch table_4
-x 11
-y 12
-end
-arch woodfloor
-x 11
-y 13
-end
-arch wwall_2_1_2
-x 11
-y 13
-end
-arch woodfloor
-x 12
-end
-arch wwall_2_1_2
-x 12
-end
-arch woodfloor
-x 12
-y 1
-end
-arch barrel
-x 12
-y 1
-end
-arch woodfloor
-x 12
-y 2
-end
-arch man
-name bartender
-hp 25
-maxhp 25
-exp 75
-dam 8
-x 12
-y 2
-unaggressive 0
-end
-arch woodfloor
-x 12
-y 3
-end
-arch bench_2_1_2
-x 12
-y 3
-move_block walk swim boat
-end
-arch woodfloor
-x 12
-y 4
-end
-arch chair
-x 12
-y 4
-end
-arch woodfloor
-x 12
-y 5
-end
-arch woodfloor
-x 12
-y 6
-end
-arch table_4
-x 12
-y 6
-end
-arch woodfloor
-x 12
-y 7
-end
-arch woodfloor
-x 12
-y 8
+x 19
+y 15
 end
 arch chair_1.2
-x 12
-y 8
-end
-arch woodfloor
-x 12
-y 9
-end
-arch woodfloor
-x 12
-y 10
-end
-arch woodfloor
-x 12
-y 11
-end
-arch woodfloor
-x 12
-y 12
-end
-arch chair_1.2
-x 12
-y 12
+x 19
+y 15
 end
 arch pirate
 msg
@@ -1292,511 +2357,304 @@ Enough for a king's ransom . . . as Redeye puts it.
 <Shrug>.  They buried the map with ole Moogly, rest his soul.
 Redeye knows more about that than we do, but he's pretty tight-lipped about it.
 endmsg
-x 12
-y 12
+x 19
+y 15
 unaggressive 1
 end
 arch woodfloor
-x 12
-y 13
+x 19
+y 16
 end
 arch wwall_2_1_2
-x 12
-y 13
+x 19
+y 16
 end
-arch woodfloor
-x 13
+arch pstone_2
+x 19
+y 17
 end
-arch wwall_2_1_2
-x 13
+arch pstone_2
+x 19
+y 18
 end
-arch woodfloor
-x 13
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
 y 1
 end
-arch barrel
-x 13
-y 1
-end
-arch woodfloor
-x 13
+arch grass_only
+x 20
 y 2
 end
 arch woodfloor
-x 13
+x 20
 y 3
 end
-arch bench_2_1_2
-x 13
-y 3
-move_block walk swim boat
-end
-arch woodfloor
-x 13
-y 4
-end
-arch woodfloor
-x 13
-y 5
-end
-arch woodfloor
-x 13
-y 6
-end
-arch chair_1.2
-x 13
-y 6
-end
-arch woodfloor
-x 13
-y 7
-end
-arch woman2
-name serving girl
-msg
-@match drink
-Hold your horses, I'll get your drinks when I'm good and ready.
-@match *
-Set yerself down at a table and I'll take your order.
-endmsg
-x 13
-y 7
-random_movement 1
-end
-arch woodfloor
-x 13
-y 8
-end
-arch woodfloor
-x 13
-y 9
-end
-arch woodfloor
-x 13
-y 10
-end
-arch wwall_1_1
-x 13
-y 10
-end
-arch woodfloor
-x 13
-y 11
-end
-arch wwall_2_1_1
-x 13
-y 11
-end
-arch woodfloor
-x 13
-y 12
-end
-arch wwall_2_1_1
-x 13
-y 12
-end
-arch woodfloor
-x 13
-y 13
-end
-arch wwall_3_1
-x 13
-y 13
-end
-arch woodfloor
-x 14
-end
-arch wwall_2_1_2
-x 14
-end
-arch woodfloor
-x 14
-y 1
-end
-arch booze
-x 14
-y 1
-end
-arch woodfloor
-x 14
-y 2
-end
-arch woodfloor
-x 14
-y 3
-end
-arch bench_2_1_2
-x 14
-y 3
-move_block walk swim boat
-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 chair_1.1
-x 14
-y 8
-end
-arch warrior_1
-msg
-@match *
->hiccup<
-endmsg
-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 chair
-x 14
-y 12
-end
-arch vampire
-name mysterious stranger
-msg
-@match treasure
-I don't know anything, ask them . . .
-@match *
-Pssst.
-I overheard those two in the next booth whispering about treasure.
-endmsg
-hp 30
-maxhp 30
-sp 5
-maxsp 5
-exp 150
-x 14
-y 12
-level 5
-unaggressive 1
-end
-arch woodfloor
-x 14
-y 13
-end
-arch wwall_2_1_2
-x 14
-y 13
-end
-arch woodfloor
-x 15
-end
-arch wwall_2_1_2
-x 15
-end
-arch woodfloor
-x 15
-y 1
-end
-arch booze
-x 15
-y 1
-end
-arch woodfloor
-x 15
-y 2
-end
-arch woodfloor
-x 15
-y 3
-end
-arch bench_2_1_2
-x 15
-y 3
-move_block walk swim boat
-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 woodfloor
-x 15
-y 8
-end
-arch table_4
-x 15
-y 8
-end
-arch woodfloor
-x 15
-y 9
-end
-arch woodfloor
-x 15
-y 10
-end
-arch woodfloor
-x 15
-y 11
-end
-arch chair_1.1
-x 15
-y 11
-end
-arch woodfloor
-x 15
-y 12
-end
-arch table_4
-x 15
-y 12
-end
-arch woodfloor
-x 15
-y 13
-end
-arch wwall_2_1_2
-x 15
-y 13
-end
-arch woodfloor
-x 16
-end
-arch wwall_2_1_2
-x 16
-end
-arch woodfloor
-x 16
-y 1
-end
-arch booze
-x 16
-y 1
-end
-arch woodfloor
-x 16
-y 2
-end
-arch woodfloor
-x 16
-y 3
-end
-arch bench_1_3
-x 16
-y 3
-move_block walk swim boat
-end
-arch woodfloor
-x 16
-y 4
-end
-arch chair_1.2
-x 16
-y 4
-end
-arch gnoll
-msg
-@match *
-Keep away from me, yer stinking up the bar.
-endmsg
-x 16
-y 4
-unaggressive 1
-end
-arch woodfloor
-x 16
-y 5
-end
-arch woodfloor
-x 16
-y 6
-end
-arch woodfloor
-x 16
-y 7
-end
-arch woodfloor
-x 16
-y 8
-end
-arch chair_1.2
-x 16
-y 8
-end
-arch woodfloor
-x 16
-y 9
-end
-arch woodfloor
-x 16
-y 10
-end
-arch woodfloor
-x 16
-y 11
-end
-arch woodfloor
-x 16
-y 12
-end
-arch chair_1.2
-x 16
-y 12
-end
-arch woodfloor
-x 16
-y 13
-end
-arch wwall_2_1_2
-x 16
-y 13
-end
-arch woodfloor
-x 17
-end
 arch wwall_2_2_3
-x 17
-end
-arch woodfloor
-x 17
-y 1
-end
-arch wwall_2_1_1
-x 17
-y 1
-end
-arch woodfloor
-x 17
-y 2
-end
-arch wwall_2_1_1
-x 17
-y 2
-end
-arch woodfloor
-x 17
-y 3
-end
-arch wwall_2_1_1
-x 17
+x 20
 y 3
 end
 arch woodfloor
-x 17
+x 20
 y 4
 end
-arch wwall_1_2
-x 17
+arch wwall_2_1_1
+x 20
 y 4
 end
 arch woodfloor
-x 17
+x 20
 y 5
 end
-arch oakdoor_1
-slaying /world/world_101_114
-hp 12
-sp 43
-x 17
+arch wwall_2_1_1
+x 20
 y 5
 end
 arch woodfloor
-x 17
+x 20
 y 6
 end
-arch oakdoor_1
-slaying /world/world_101_114
-hp 12
-sp 43
-x 17
+arch wwall_2_1_1
+x 20
 y 6
 end
 arch woodfloor
-x 17
+x 20
 y 7
 end
-arch wwall_1_1
-x 17
+arch wwall_2_1_1
+x 20
 y 7
 end
 arch woodfloor
-x 17
+x 20
 y 8
 end
 arch wwall_2_1_1
-x 17
+x 20
 y 8
 end
 arch woodfloor
-x 17
+x 20
 y 9
 end
 arch wwall_2_1_1
-x 17
+x 20
 y 9
 end
 arch woodfloor
-x 17
+x 20
 y 10
 end
 arch wwall_2_1_1
-x 17
+x 20
 y 10
 end
 arch woodfloor
-x 17
+x 20
 y 11
 end
-arch wwall_2_1_1
-x 17
+arch wwall_3_4
+x 20
 y 11
 end
 arch woodfloor
-x 17
+x 20
 y 12
 end
 arch wwall_2_1_1
-x 17
+x 20
 y 12
 end
 arch woodfloor
-x 17
+x 20
 y 13
 end
+arch wwall_2_1_1
+x 20
+y 13
+end
+arch woodfloor
+x 20
+y 14
+end
+arch wwall_2_1_1
+x 20
+y 14
+end
+arch woodfloor
+x 20
+y 15
+end
+arch wwall_2_1_1
+x 20
+y 15
+end
+arch woodfloor
+x 20
+y 16
+end
 arch wwall_2_2_4
-x 17
+x 20
+y 16
+end
+arch pstone_2
+x 20
+y 17
+end
+arch pstone_2
+x 20
+y 18
+end
+arch cobblestones2
+x 21
+end
+arch cobblestones2
+x 21
+y 1
+end
+arch grass_only
+x 21
+y 2
+end
+arch grass_only
+x 21
+y 3
+end
+arch grass_only
+x 21
+y 4
+end
+arch grass_only
+x 21
+y 5
+end
+arch grass_only
+x 21
+y 6
+end
+arch grass_only
+x 21
+y 7
+end
+arch grass_only
+x 21
+y 8
+end
+arch pstone_2
+x 21
+y 9
+end
+arch pstone_2
+x 21
+y 10
+end
+arch pstone_2
+x 21
+y 11
+end
+arch pstone_2
+x 21
+y 12
+end
+arch pstone_2
+x 21
 y 13
 end
+arch pstone_2
+x 21
+y 14
+end
+arch pstone_2
+x 21
+y 15
+end
+arch pstone_2
+x 21
+y 16
+end
+arch pstone_2
+x 21
+y 17
+end
+arch pstone_2
+x 21
+y 18
+end
+arch cobblestones2
+x 22
+end
+arch cobblestones2
+x 22
+y 1
+end
+arch cobblestones2
+x 22
+y 2
+end
+arch cobblestones2
+x 22
+y 3
+end
+arch cobblestones2
+x 22
+y 4
+end
+arch cobblestones2
+x 22
+y 5
+end
+arch cobblestones2
+x 22
+y 6
+end
+arch cobblestones2
+x 22
+y 7
+end
+arch cobblestones2
+x 22
+y 8
+end
+arch cobblestones2
+x 22
+y 9
+end
+arch cobblestones2
+x 22
+y 10
+end
+arch cobblestones2
+x 22
+y 11
+end
+arch cobblestones2
+x 22
+y 12
+end
+arch cobblestones2
+x 22
+y 13
+end
+arch cobblestones2
+x 22
+y 14
+end
+arch cobblestones2
+x 22
+y 15
+end
+arch cobblestones2
+x 22
+y 16
+end
+arch cobblestones2
+x 22
+y 17
+end
+arch cobblestones2
+x 22
+y 18
+end
diff --git a/world/world_101_114 b/world/world_101_114
index 957a3b2cc..78a62b29d 100644
--- a/world/world_101_114
+++ b/world/world_101_114
@@ -4,7 +4,7 @@ region portjoseph
 width 50
 height 50
 msg
-Modified: 2011-11-26 Rick Tanner
+Modified: 2011-11-30 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_101_113
@@ -2980,8 +2980,8 @@ slaying /port_joseph/town/dshark
 msg
 A dangerous looking crowd . .
 endmsg
-hp 17
-sp 5
+hp 14
+sp 14
 x 12
 y 43
 end