From f53f83f480c5f26b8a296938a292f7448287f13f Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 19 Apr 2011 04:28:05 +0000
Subject: [PATCH] Changes to Wayfarer's rest in Port Joseph.  Kept the original
 floor plan. Map considered an outdoor map so darkness or time of day is
 visible when inside; added light sources. Updated world map for new map
 entrance destination.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14415 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 port_joseph/town/inn | 2756 +++++++++++++++++++++++++++---------------
 world/world_101_114  |    4 +-
 2 files changed, 1771 insertions(+), 989 deletions(-)

diff --git a/port_joseph/town/inn b/port_joseph/town/inn
index 48ba281df..0e9bddc34 100644
--- a/port_joseph/town/inn
+++ b/port_joseph/town/inn
@@ -2,808 +2,982 @@ arch map
 name Wayfarers' rest
 difficulty 1
 region portjoseph
-width 20
-height 13
+width 24
+height 17
 enter_x 9
 enter_y 11
 msg
 Created:  1994-05-11 langley (llangley@fermat.dartmouth.edu)
-Modified: 2008-09-21 Rick Tanner
+Modified: 2011-04-18 Rick Tanner
 endmsg
+outdoor 1
+end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+end
+arch cobblestones2
+y 14
+end
+arch cobblestones2
+y 15
+end
+arch cobblestones2
+y 16
+end
+arch 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 cobblestones2
+x 1
+y 16
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch afloor_right
+x 2
+y 2
 end
 arch dwall_2_2_2
-end
-arch afloor_right
-y 1
-end
-arch dwall_2_1_1
-y 1
-end
-arch afloor_right
-y 2
-end
-arch dwall_3_2
+x 2
 y 2
 end
 arch afloor_right
+x 2
 y 3
 end
 arch dwall_2_1_1
+x 2
 y 3
 end
 arch afloor_right
+x 2
 y 4
 end
-arch dwall_2_1_1
+arch dwall_3_2
+x 2
 y 4
 end
 arch afloor_right
+x 2
 y 5
 end
 arch dwall_2_1_1
+x 2
 y 5
 end
-arch afloor_right
-y 6
-end
-arch dwall_3_2
+arch light2
+x 2
 y 6
 end
 arch afloor_right
+x 2
+y 6
+end
+arch dwall_win1
+x 2
+y 6
+end
+arch afloor_right
+x 2
 y 7
 end
 arch dwall_2_1_1
+x 2
 y 7
 end
 arch afloor_right
+x 2
 y 8
 end
-arch dwall_2_1_1
-y 8
-end
-arch afloor_right
-y 9
-end
-arch dwall_2_1_1
-y 9
-end
-arch afloor_right
-y 10
-end
 arch dwall_3_2
+x 2
+y 8
+end
+arch afloor_right
+x 2
+y 9
+end
+arch dwall_2_1_1
+x 2
+y 9
+end
+arch light2
+x 2
 y 10
 end
 arch afloor_right
+x 2
+y 10
+end
+arch dwall_win1
+x 2
+y 10
+end
+arch afloor_right
+x 2
 y 11
 end
 arch dwall_2_1_1
+x 2
 y 11
 end
 arch afloor_right
+x 2
 y 12
 end
+arch dwall_3_2
+x 2
+y 12
+end
+arch afloor_right
+x 2
+y 13
+end
+arch dwall_2_1_1
+x 2
+y 13
+end
+arch afloor_right
+x 2
+y 14
+end
 arch dwall_2_2_1
-y 12
+x 2
+y 14
 end
-arch afloor_right
-x 1
+arch grass_only
+x 2
+y 15
 end
-arch cwall_2_1_2
-x 1
+arch cobblestones2
+x 2
+y 16
 end
-arch afloor_right
-x 1
-y 1
+arch grass_only
+x 3
 end
-arch bed_save
-x 1
+arch grass_only
+x 3
 y 1
 end
 arch afloor_right
-x 1
+x 3
 y 2
 end
 arch cwall_2_1_2
-x 1
+x 3
 y 2
 end
 arch afloor_right
-x 1
+x 3
 y 3
 end
 arch bed_save
-x 1
+x 3
 y 3
 end
+arch afloor_right
+x 3
+y 4
+end
+arch cwall_2_1_2
+x 3
+y 4
+end
+arch afloor_right
+x 3
+y 5
+end
+arch bed_save
+x 3
+y 5
+end
+arch light4
+x 3
+y 6
+end
 arch button_small
-x 1
-y 4
+x 3
+y 6
 connected 3
 end
 arch afloor_right
-x 1
-y 4
-end
-arch afloor_right
-x 1
-y 5
-end
-arch afloor_right
-x 1
+x 3
 y 6
 end
+arch afloor_right
+x 3
+y 7
+end
+arch afloor_right
+x 3
+y 8
+end
 arch cwall_2_1_2
-x 1
-y 6
+x 3
+y 8
 end
 arch afloor_right
-x 1
-y 7
+x 3
+y 9
 end
 arch bed_save
-x 1
-y 7
+x 3
+y 9
+end
+arch light4
+x 3
+y 10
 end
 arch button_small
-x 1
-y 8
+x 3
+y 10
 connected 2
 end
 arch afloor_right
-x 1
-y 8
+x 3
+y 10
 end
 arch afloor_right
-x 1
-y 9
+x 3
+y 11
 end
 arch table_2
-x 1
-y 9
+x 3
+y 11
 end
 arch afloor_right
-x 1
-y 10
+x 3
+y 12
 end
 arch dwall_2_1_2
-x 1
-y 10
+x 3
+y 12
 end
 arch afloor_right
-x 1
-y 11
+x 3
+y 13
 end
 arch bed_save
-x 1
-y 11
+x 3
+y 13
 end
 arch afloor_right
-x 1
-y 12
+x 3
+y 14
 end
 arch cwall_2_1_2
-x 1
-y 12
+x 3
+y 14
 end
-arch afloor_right
-x 2
+arch grass_only
+x 3
+y 15
 end
-arch cwall_2_1_2
-x 2
+arch cobblestones2
+x 3
+y 16
 end
-arch afloor_right
-x 2
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch afloor_right
-x 2
+arch light2
+x 4
 y 2
 end
+arch afloor_right
+x 4
+y 2
+end
+arch dwall_win2
+x 4
+y 2
+end
+arch light4
+x 4
+y 3
+end
+arch afloor_right
+x 4
+y 3
+end
+arch afloor_right
+x 4
+y 4
+end
 arch dwall_3_3
-x 2
-y 2
+x 4
+y 4
 end
 arch afloor_right
-x 2
-y 3
+x 4
+y 5
 end
 arch dwall_1_2
-x 2
-y 3
+x 4
+y 5
 end
 arch button_small
-x 2
-y 4
+x 4
+y 6
 connected 3
 end
 arch afloor_right
-x 2
-y 4
+x 4
+y 6
 end
 arch grate_closed_2
-x 2
-y 4
+x 4
+y 6
 speed 0.500000
 connected 3
 end
 arch afloor_right
-x 2
-y 5
+x 4
+y 7
 end
 arch dwall_1_1
-x 2
-y 5
+x 4
+y 7
 end
 arch afloor_right
-x 2
-y 6
+x 4
+y 8
 end
 arch dwall_3_4
-x 2
-y 6
+x 4
+y 8
 end
 arch afloor_right
-x 2
-y 7
+x 4
+y 9
 end
 arch dwall_1_2
-x 2
-y 7
+x 4
+y 9
 end
 arch button_small
-x 2
-y 8
+x 4
+y 10
 connected 2
 end
 arch afloor_right
-x 2
-y 8
+x 4
+y 10
 end
 arch grate_closed_2
-x 2
-y 8
+x 4
+y 10
 speed 0.500000
 connected 2
 end
 arch afloor_right
-x 2
-y 9
+x 4
+y 11
 end
 arch dwall_1_1
-x 2
-y 9
-end
-arch afloor_right
-x 2
-y 10
-end
-arch dwall_3_1
-x 2
-y 10
-end
-arch afloor_right
-x 2
+x 4
 y 11
 end
 arch afloor_right
-x 2
+x 4
 y 12
 end
-arch cwall_2_1_2
-x 2
+arch dwall_3_1
+x 4
 y 12
 end
-arch afloor_right
-x 3
-end
-arch cwall_2_1_2
-x 3
+arch light4
+x 4
+y 13
 end
 arch afloor_right
-x 3
+x 4
+y 13
+end
+arch light2
+x 4
+y 14
+end
+arch afloor_right
+x 4
+y 14
+end
+arch dwall_win2
+x 4
+y 14
+end
+arch grass_only
+x 4
+y 15
+end
+arch cobblestones2
+x 4
+y 16
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
 arch afloor_right
-x 3
+x 5
 y 2
 end
-arch dwall_1_3
-x 3
+arch cwall_2_1_2
+x 5
 y 2
 end
-arch afloor_left
-x 3
+arch afloor_right
+x 5
 y 3
 end
-arch button_small
-x 3
+arch afloor_right
+x 5
 y 4
+end
+arch dwall_1_3
+x 5
+y 4
+end
+arch afloor_left
+x 5
+y 5
+end
+arch button_small
+x 5
+y 6
 connected 3
 end
 arch afloor_left
-x 3
-y 4
-end
-arch afloor_left
-x 3
-y 5
-end
-arch afloor_left
-x 3
+x 5
 y 6
 end
 arch afloor_left
-x 3
+x 5
 y 7
 end
-arch button_small
-x 3
+arch afloor_left
+x 5
 y 8
+end
+arch afloor_left
+x 5
+y 9
+end
+arch button_small
+x 5
+y 10
 connected 2
 end
 arch afloor_left
-x 3
-y 8
+x 5
+y 10
 end
 arch afloor_left
-x 3
-y 9
-end
-arch afloor_right
-x 3
-y 10
-end
-arch swall_2_1_2
-x 3
-y 10
-end
-arch afloor_right
-x 3
+x 5
 y 11
 end
 arch afloor_right
-x 3
+x 5
 y 12
 end
-arch cwall_2_1_2
-x 3
+arch swall_2_1_2
+x 5
+y 12
+end
+arch dwall_1_3
+x 5
 y 12
 end
 arch afloor_right
-x 4
+x 5
+y 13
+end
+arch afloor_right
+x 5
+y 14
 end
 arch cwall_2_1_2
-x 4
+x 5
+y 14
+end
+arch grass_only
+x 5
+y 15
+end
+arch cobblestones2
+x 5
+y 16
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch afloor_right
+x 6
+y 2
+end
+arch cwall_2_1_2
+x 6
+y 2
+end
+arch light4
+x 6
+y 3
 end
 arch button_small
-x 4
-y 1
+x 6
+y 3
 connected 4
 end
 arch afloor_right
-x 4
-y 1
+x 6
+y 3
 end
 arch button_small
-x 4
-y 2
+x 6
+y 4
 connected 4
 end
 arch afloor_right
-x 4
-y 2
+x 6
+y 4
 end
 arch grate_closed_1
-x 4
-y 2
+x 6
+y 4
 speed 0.500000
 connected 4
 end
 arch button_small
-x 4
-y 3
+x 6
+y 5
 connected 4
 end
 arch afloor_left
-x 4
-y 3
-end
-arch dungeon_floor
-x 4
-y 4
-end
-arch dungeon_floor
-x 4
+x 6
 y 5
 end
-arch dungeon_floor
-x 4
+arch light4
+x 6
 y 6
 end
 arch dungeon_floor
-x 4
+x 6
+y 6
+end
+arch dungeon_floor
+x 6
 y 7
 end
 arch dungeon_floor
-x 4
+x 6
 y 8
 end
-arch afloor_left
-x 4
+arch dungeon_floor
+x 6
 y 9
 end
-arch afloor_right
-x 4
+arch light4
+x 6
 y 10
 end
-arch dwall_2_1_2
-x 4
+arch dungeon_floor
+x 6
 y 10
 end
-arch afloor_right
-x 4
+arch afloor_left
+x 6
 y 11
 end
 arch afloor_right
-x 4
+x 6
 y 12
 end
-arch cwall_2_1_2
-x 4
+arch swall_2_1_2
+x 6
 y 12
 end
-arch afloor_right
-x 5
-end
-arch cwall_2_1_2
-x 5
-end
-arch afloor_right
-x 5
-y 1
-end
-arch table
-x 5
-y 1
-end
-arch afloor_right
-x 5
-y 2
-end
 arch dwall_1_4
-x 5
-y 2
-end
-arch afloor_left
-x 5
-y 3
-end
-arch dungeon_floor
-x 5
-y 4
-end
-arch tree
-x 5
-y 5
-end
-arch dungeon_floor
-x 5
-y 6
-end
-arch tree
-x 5
-y 7
-end
-arch dungeon_floor
-x 5
-y 8
-end
-arch afloor_left
-x 5
-y 9
-end
-arch afloor_right
-x 5
-y 10
-end
-arch dwall_1_3
-x 5
-y 10
-end
-arch afloor_right
-x 5
-y 11
-end
-arch afloor_right
-x 5
-y 12
-end
-arch cwall_2_1_2
-x 5
+x 6
 y 12
 end
 arch afloor_right
 x 6
+y 13
+end
+arch afloor_right
+x 6
+y 14
+end
+arch cwall_2_1_2
+x 6
+y 14
+end
+arch grass_only
+x 6
+y 15
+end
+arch cobblestones2
+x 6
+y 16
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch afloor_right
+x 7
+y 2
+end
+arch cwall_2_1_2
+x 7
+y 2
+end
+arch afloor_right
+x 7
+y 3
+end
+arch table
+x 7
+y 3
+end
+arch afloor_right
+x 7
+y 4
+end
+arch dwall_1_4
+x 7
+y 4
+end
+arch afloor_left
+x 7
+y 5
+end
+arch dungeon_floor
+x 7
+y 6
+end
+arch tree
+x 7
+y 7
+end
+arch dungeon_floor
+x 7
+y 8
+end
+arch tree
+x 7
+y 9
+end
+arch dungeon_floor
+x 7
+y 10
+end
+arch afloor_left
+x 7
+y 11
+end
+arch afloor_right
+x 7
+y 12
+end
+arch dwall_1_3
+x 7
+y 12
+end
+arch afloor_right
+x 7
+y 13
+end
+arch afloor_right
+x 7
+y 14
+end
+arch cwall_2_1_2
+x 7
+y 14
+end
+arch grass_only
+x 7
+y 15
+end
+arch cobblestones2
+x 7
+y 16
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch afloor_right
+x 8
+y 2
 end
 arch dwall_3_3
-x 6
-end
-arch afloor_right
-x 6
-y 1
-end
-arch dwall_2_1_1
-x 6
-y 1
-end
-arch afloor_right
-x 6
+x 8
 y 2
 end
-arch dwall_3_1
-x 6
-y 2
-end
-arch afloor_left
-x 6
+arch afloor_right
+x 8
 y 3
 end
-arch dungeon_floor
-x 6
+arch dwall_2_1_1
+x 8
+y 3
+end
+arch afloor_right
+x 8
 y 4
 end
-arch dungeon_floor
-x 6
+arch dwall_3_1
+x 8
+y 4
+end
+arch afloor_left
+x 8
 y 5
 end
 arch dungeon_floor
-x 6
+x 8
 y 6
 end
 arch dungeon_floor
-x 6
+x 8
 y 7
 end
 arch dungeon_floor
-x 6
+x 8
 y 8
 end
-arch button_small
-x 6
+arch dungeon_floor
+x 8
 y 9
+end
+arch dungeon_floor
+x 8
+y 10
+end
+arch button_small
+x 8
+y 11
 connected 1
 end
 arch afloor_left
-x 6
-y 9
+x 8
+y 11
 end
 arch button_small
-x 6
-y 10
+x 8
+y 12
 connected 1
 end
 arch afloor_right
-x 6
-y 10
+x 8
+y 12
 end
 arch grate_closed_1
-x 6
-y 10
+x 8
+y 12
 speed 0.500000
 connected 1
 end
+arch light4
+x 8
+y 13
+end
 arch button_small
-x 6
-y 11
+x 8
+y 13
 connected 1
 end
 arch afloor_right
-x 6
-y 11
+x 8
+y 13
+end
+arch light2
+x 8
+y 14
 end
 arch afloor_right
-x 6
-y 12
+x 8
+y 14
 end
-arch cwall_2_1_2
-x 6
-y 12
+arch dwall_win2
+x 8
+y 14
 end
-arch afloor_right
-x 7
+arch grass_only
+x 8
+y 15
 end
-arch cwall_2_1_2
-x 7
+arch cobblestones2
+x 8
+y 16
 end
-arch afloor_right
-x 7
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
 y 1
 end
+arch afloor_right
+x 9
+y 2
+end
+arch cwall_2_1_2
+x 9
+y 2
+end
+arch afloor_right
+x 9
+y 3
+end
 arch table
-x 7
-y 1
+x 9
+y 3
 end
 arch afloor_right
-x 7
-y 2
+x 9
+y 4
 end
 arch swall_2_1_2
-x 7
-y 2
-end
-arch afloor_left
-x 7
-y 3
-end
-arch dungeon_floor
-x 7
+x 9
 y 4
 end
-arch dungeon_floor
-x 7
-y 5
-end
-arch dungeon_floor
-x 7
-y 6
-end
-arch dungeon_floor
-x 7
-y 7
-end
-arch dungeon_floor
-x 7
-y 8
-end
-arch afloor_left
-x 7
-y 9
-end
-arch afloor_right
-x 7
-y 10
-end
-arch dwall_1_4
-x 7
-y 10
-end
-arch afloor_right
-x 7
-y 11
-end
-arch chair_1.2
-x 7
-y 11
-end
-arch afloor_right
-x 7
-y 12
-end
-arch cwall_2_1_2
-x 7
-y 12
-end
-arch afloor_right
-x 8
-end
-arch cwall_2_1_2
-x 8
-end
-arch afloor_right
-x 8
-y 1
-end
-arch chair_1.2
-x 8
-y 1
-end
-arch afloor_right
-x 8
-y 2
-end
-arch dwall_2_1_2
-x 8
-y 2
-end
-arch afloor_left
-x 8
-y 3
-end
-arch dungeon_floor
-x 8
-y 4
-end
-arch sea
-name fountain
-x 8
-y 5
-end
-arch sea
-name fountain
-x 8
-y 6
-end
-arch sea
-name fountain
-x 8
-y 7
-end
-arch dungeon_floor
-x 8
-y 8
-end
-arch afloor_left
-x 8
-y 9
-end
-arch afloor_right
-x 8
-y 10
-end
-arch dwall_2_2_3
-x 8
-y 10
-end
-arch afloor_right
-x 8
-y 11
-end
-arch dwall_2_1_1
-x 8
-y 11
-end
-arch afloor_right
-x 8
-y 12
-end
-arch dwall_2_2_4
-x 8
-y 12
-end
-arch afloor_right
-x 9
-end
-arch cwall_2_1_2
-x 9
-end
-arch afloor_right
-x 9
-y 1
-end
-arch afloor_right
-x 9
-y 2
-end
 arch dwall_1_3
 x 9
-y 2
+y 4
 end
 arch afloor_left
 x 9
-y 3
+y 5
 end
 arch dungeon_floor
 x 9
-y 4
-end
-arch sea
-name fountain
-x 9
-y 5
-end
-arch sea
-name fountain
-x 9
 y 6
 end
-arch statue
-x 9
-y 6
-end
-arch sea
-name fountain
+arch dungeon_floor
 x 9
 y 7
 end
@@ -819,880 +993,1488 @@ arch dungeon_floor
 x 9
 y 10
 end
-arch dungeon_floor
+arch afloor_left
 x 9
 y 11
 end
+arch afloor_right
+x 9
+y 12
+end
+arch dwall_1_4
+x 9
+y 12
+end
+arch afloor_right
+x 9
+y 13
+end
+arch chair_1.2
+x 9
+y 13
+end
+arch afloor_right
+x 9
+y 14
+end
+arch cwall_2_1_2
+x 9
+y 14
+end
+arch grass_only
+x 9
+y 15
+end
+arch cobblestones2
+x 9
+y 16
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch light2
+x 10
+y 2
+end
+arch afloor_right
+x 10
+y 2
+end
+arch dwall_win2
+x 10
+y 2
+end
+arch light4
+x 10
+y 3
+end
+arch afloor_right
+x 10
+y 3
+end
+arch chair_1.2
+x 10
+y 3
+end
+arch afloor_right
+x 10
+y 4
+end
+arch swall_2_1_2
+x 10
+y 4
+end
+arch dwall_1_4
+x 10
+y 4
+end
+arch afloor_left
+x 10
+y 5
+end
+arch dungeon_floor
+x 10
+y 6
+end
+arch light4
+x 10
+y 7
+end
+arch sea
+name fountain
+x 10
+y 7
+end
+arch sea
+name fountain
+x 10
+y 8
+end
+arch light4
+x 10
+y 9
+end
+arch sea
+name fountain
+x 10
+y 9
+end
+arch dungeon_floor
+x 10
+y 10
+end
+arch afloor_left
+x 10
+y 11
+end
+arch afloor_right
+x 10
+y 12
+end
+arch dwall_2_2_3
+x 10
+y 12
+end
+arch afloor_right
+x 10
+y 13
+end
+arch dwall_2_1_1
+x 10
+y 13
+end
+arch afloor_right
+x 10
+y 14
+end
+arch dwall_2_2_4
+x 10
+y 14
+end
+arch grass_only
+x 10
+y 15
+end
+arch cobblestones2
+x 10
+y 16
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch afloor_right
+x 11
+y 2
+end
+arch cwall_2_1_2
+x 11
+y 2
+end
+arch afloor_right
+x 11
+y 3
+end
+arch afloor_right
+x 11
+y 4
+end
+arch dwall_1_3
+x 11
+y 4
+end
+arch afloor_left
+x 11
+y 5
+end
+arch dungeon_floor
+x 11
+y 6
+end
+arch sea
+name fountain
+x 11
+y 7
+end
+arch sea
+name fountain
+x 11
+y 8
+end
+arch statue
+x 11
+y 8
+end
+arch sea
+name fountain
+x 11
+y 9
+end
+arch dungeon_floor
+x 11
+y 10
+end
+arch dungeon_floor
+x 11
+y 11
+end
+arch light4
+x 11
+y 12
+end
+arch dungeon_floor
+x 11
+y 12
+end
+arch dungeon_floor
+x 11
+y 13
+end
 arch invis_exit
 slaying /world/world_101_114
 hp 17
 sp 30
-x 9
-y 12
+x 11
+y 14
 end
 arch dungeon_floor
-x 9
-y 12
+x 11
+y 14
+end
+arch grass_only
+x 11
+y 15
+end
+arch cobblestones2
+x 11
+y 16
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
 end
 arch afloor_right
-x 10
+x 12
+y 2
 end
 arch cwall_2_1_2
-x 10
+x 12
+y 2
 end
 arch button_small
-x 10
-y 1
+x 12
+y 3
 connected 5
 end
 arch afloor_right
-x 10
-y 1
+x 12
+y 3
 end
 arch button_small
-x 10
-y 2
+x 12
+y 4
 connected 5
 end
 arch afloor_right
-x 10
-y 2
+x 12
+y 4
 end
 arch grate_closed_1
-x 10
-y 2
+x 12
+y 4
 speed 0.500000
 connected 5
 end
 arch button_small
-x 10
-y 3
+x 12
+y 5
 connected 5
 end
 arch afloor_left
-x 10
-y 3
-end
-arch dungeon_floor
-x 10
-y 4
-end
-arch sea
-name fountain
-x 10
+x 12
 y 5
 end
-arch sea
-name fountain
-x 10
-y 6
-end
-arch statue
-x 10
+arch dungeon_floor
+x 12
 y 6
 end
 arch sea
 name fountain
-x 10
+x 12
 y 7
 end
-arch dungeon_floor
-x 10
+arch sea
+name fountain
+x 12
 y 8
 end
-arch dungeon_floor
-x 10
+arch statue
+x 12
+y 8
+end
+arch sea
+name fountain
+x 12
 y 9
 end
 arch dungeon_floor
-x 10
+x 12
 y 10
 end
 arch dungeon_floor
-x 10
+x 12
 y 11
 end
+arch dungeon_floor
+x 12
+y 12
+end
+arch dungeon_floor
+x 12
+y 13
+end
 arch invis_exit
 slaying /world/world_101_114
 hp 17
 sp 30
-x 10
-y 12
+x 12
+y 14
 end
 arch dungeon_floor
-x 10
-y 12
+x 12
+y 14
 end
-arch afloor_right
-x 11
+arch grass_only
+x 12
+y 15
 end
-arch cwall_2_1_2
-x 11
+arch cobblestones2
+x 12
+y 16
 end
-arch afloor_right
-x 11
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
 y 1
 end
+arch light2
+x 13
+y 2
+end
 arch afloor_right
-x 11
+x 13
 y 2
 end
-arch dwall_1_4
-x 11
+arch dwall_win2
+x 13
 y 2
 end
-arch afloor_left
-x 11
+arch light4
+x 13
 y 3
 end
-arch dungeon_floor
-x 11
-y 4
-end
-arch sea
-name fountain
-x 11
-y 5
-end
-arch sea
-name fountain
-x 11
-y 6
-end
-arch sea
-name fountain
-x 11
-y 7
-end
-arch dungeon_floor
-x 11
-y 8
-end
-arch afloor_left
-x 11
-y 9
+arch afloor_right
+x 13
+y 3
 end
 arch afloor_right
-x 11
+x 13
+y 4
+end
+arch dwall_1_4
+x 13
+y 4
+end
+arch afloor_left
+x 13
+y 5
+end
+arch dungeon_floor
+x 13
+y 6
+end
+arch light4
+x 13
+y 7
+end
+arch sea
+name fountain
+x 13
+y 7
+end
+arch sea
+name fountain
+x 13
+y 8
+end
+arch light4
+x 13
+y 9
+end
+arch sea
+name fountain
+x 13
+y 9
+end
+arch dungeon_floor
+x 13
 y 10
 end
+arch afloor_left
+x 13
+y 11
+end
+arch afloor_right
+x 13
+y 12
+end
 arch dwall_2_2_2
-x 11
-y 10
+x 13
+y 12
 end
 arch afloor_right
-x 11
-y 11
+x 13
+y 13
 end
 arch dwall_2_1_1
-x 11
-y 11
+x 13
+y 13
 end
 arch afloor_right
-x 11
-y 12
+x 13
+y 14
 end
 arch dwall_2_2_1
-x 11
-y 12
+x 13
+y 14
+end
+arch grass_only
+x 13
+y 15
+end
+arch cobblestones2
+x 13
+y 16
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
 end
 arch afloor_right
-x 12
+x 14
+y 2
 end
 arch cwall_2_1_2
-x 12
-end
-arch afloor_right
-x 12
-y 1
-end
-arch bed_save
-x 12
-y 1
-end
-arch afloor_right
-x 12
+x 14
 y 2
 end
-arch dwall_2_1_2
-x 12
-y 2
-end
-arch afloor_left
-x 12
+arch afloor_right
+x 14
 y 3
 end
-arch dungeon_floor
-x 12
+arch bed_save
+x 14
+y 3
+end
+arch afloor_right
+x 14
 y 4
 end
-arch dungeon_floor
-x 12
+arch dwall_2_1_2
+x 14
+y 4
+end
+arch afloor_left
+x 14
 y 5
 end
 arch dungeon_floor
-x 12
+x 14
 y 6
 end
 arch dungeon_floor
-x 12
+x 14
 y 7
 end
 arch dungeon_floor
-x 12
+x 14
 y 8
 end
-arch afloor_left
-x 12
+arch dungeon_floor
+x 14
 y 9
 end
-arch afloor_right
-x 12
+arch dungeon_floor
+x 14
 y 10
 end
-arch dwall_1_3
-x 12
-y 10
-end
-arch afloor_right
-x 12
+arch afloor_left
+x 14
 y 11
 end
 arch afloor_right
-x 12
+x 14
 y 12
 end
+arch dwall_1_3
+x 14
+y 12
+end
+arch afloor_right
+x 14
+y 13
+end
+arch afloor_right
+x 14
+y 14
+end
 arch dwall_2_1_2
-x 12
-y 12
+x 14
+y 14
+end
+arch grass_only
+x 14
+y 15
+end
+arch cobblestones2
+x 14
+y 16
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
 end
 arch afloor_right
-x 13
+x 15
+y 2
 end
 arch dwall_3_3
-x 13
-end
-arch afloor_right
-x 13
-y 1
-end
-arch dwall_2_1_1
-x 13
-y 1
-end
-arch afloor_right
-x 13
+x 15
 y 2
 end
-arch dwall_3_1
-x 13
-y 2
-end
-arch afloor_left
-x 13
+arch afloor_right
+x 15
 y 3
 end
-arch dungeon_floor
-x 13
+arch dwall_2_1_1
+x 15
+y 3
+end
+arch afloor_right
+x 15
 y 4
 end
-arch dungeon_floor
-x 13
+arch dwall_3_1
+x 15
+y 4
+end
+arch afloor_left
+x 15
 y 5
 end
 arch dungeon_floor
-x 13
+x 15
 y 6
 end
 arch dungeon_floor
-x 13
+x 15
 y 7
 end
 arch dungeon_floor
-x 13
+x 15
 y 8
 end
-arch button_small
-x 13
+arch dungeon_floor
+x 15
 y 9
+end
+arch dungeon_floor
+x 15
+y 10
+end
+arch button_small
+x 15
+y 11
 connected 9
 end
 arch afloor_left
-x 13
-y 9
+x 15
+y 11
 end
 arch button_small
-x 13
-y 10
+x 15
+y 12
 connected 9
 end
 arch afloor_right
-x 13
-y 10
+x 15
+y 12
 end
 arch grate_closed_1
-x 13
-y 10
+x 15
+y 12
 speed 0.500000
 connected 9
 end
+arch light4
+x 15
+y 13
+end
 arch button_small
-x 13
-y 11
+x 15
+y 13
 connected 9
 end
 arch afloor_right
-x 13
-y 11
+x 15
+y 13
+end
+arch light2
+x 15
+y 14
 end
 arch afloor_right
-x 13
-y 12
+x 15
+y 14
 end
-arch dwall_2_1_2
-x 13
-y 12
+arch dwall_win2
+x 15
+y 14
+end
+arch grass_only
+x 15
+y 15
+end
+arch cobblestones2
+x 15
+y 16
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
 end
 arch afloor_right
-x 14
+x 16
+y 2
 end
 arch cwall_2_1_2
-x 14
+x 16
+y 2
 end
 arch afloor_right
-x 14
-y 1
+x 16
+y 3
 end
 arch chair_2.1
-x 14
-y 1
+x 16
+y 3
 end
 arch afloor_right
-x 14
-y 2
+x 16
+y 4
 end
 arch dwall_1_3
-x 14
-y 2
-end
-arch afloor_left
-x 14
-y 3
-end
-arch dungeon_floor
-x 14
+x 16
 y 4
 end
-arch tree
-x 14
+arch afloor_left
+x 16
 y 5
 end
 arch dungeon_floor
-x 14
+x 16
 y 6
 end
 arch tree
-x 14
+x 16
 y 7
 end
 arch dungeon_floor
-x 14
+x 16
 y 8
 end
-arch afloor_left
-x 14
+arch tree
+x 16
 y 9
 end
-arch afloor_right
-x 14
+arch dungeon_floor
+x 16
 y 10
 end
-arch dwall_1_4
-x 14
-y 10
-end
-arch afloor_right
-x 14
+arch afloor_left
+x 16
 y 11
 end
 arch afloor_right
-x 14
+x 16
 y 12
 end
+arch dwall_1_4
+x 16
+y 12
+end
+arch afloor_right
+x 16
+y 13
+end
+arch afloor_right
+x 16
+y 14
+end
 arch dwall_2_1_2
-x 14
-y 12
+x 16
+y 14
+end
+arch grass_only
+x 16
+y 15
+end
+arch cobblestones2
+x 16
+y 16
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
 end
 arch afloor_right
-x 15
+x 17
+y 2
 end
 arch cwall_2_1_2
-x 15
+x 17
+y 2
+end
+arch light4
+x 17
+y 3
 end
 arch button_small
-x 15
-y 1
+x 17
+y 3
 connected 6
 end
 arch afloor_right
-x 15
-y 1
+x 17
+y 3
 end
 arch button_small
-x 15
-y 2
+x 17
+y 4
 connected 6
 end
 arch afloor_right
-x 15
-y 2
+x 17
+y 4
 end
 arch grate_closed_1
-x 15
-y 2
+x 17
+y 4
 speed 0.500000
 connected 6
 end
 arch button_small
-x 15
-y 3
+x 17
+y 5
 connected 6
 end
 arch afloor_left
-x 15
-y 3
-end
-arch dungeon_floor
-x 15
-y 4
-end
-arch dungeon_floor
-x 15
+x 17
 y 5
 end
-arch dungeon_floor
-x 15
+arch light4
+x 17
 y 6
 end
 arch dungeon_floor
-x 15
+x 17
+y 6
+end
+arch dungeon_floor
+x 17
 y 7
 end
 arch dungeon_floor
-x 15
+x 17
 y 8
 end
-arch afloor_left
-x 15
+arch dungeon_floor
+x 17
 y 9
 end
-arch afloor_right
-x 15
+arch light4
+x 17
 y 10
 end
-arch dwall_2_1_2
-x 15
+arch dungeon_floor
+x 17
 y 10
 end
-arch afloor_right
-x 15
+arch afloor_left
+x 17
 y 11
 end
 arch afloor_right
-x 15
+x 17
 y 12
 end
-arch dwall_2_1_2
-x 15
-y 12
-end
-arch afloor_right
-x 16
-end
-arch cwall_2_1_2
-x 16
-end
-arch afloor_right
-x 16
-y 1
-end
-arch afloor_right
-x 16
-y 2
-end
-arch dwall_1_4
-x 16
-y 2
-end
-arch afloor_left
-x 16
-y 3
-end
-arch button_small
-x 16
-y 4
-connected 7
-end
-arch afloor_left
-x 16
-y 4
-end
-arch afloor_left
-x 16
-y 5
-end
-arch afloor_left
-x 16
-y 6
-end
-arch afloor_left
-x 16
-y 7
-end
-arch button_small
-x 16
-y 8
-connected 8
-end
-arch afloor_left
-x 16
-y 8
-end
-arch afloor_left
-x 16
-y 9
-end
-arch afloor_right
-x 16
-y 10
-end
 arch swall_2_1_2
-x 16
-y 10
-end
-arch afloor_right
-x 16
-y 11
-end
-arch afloor_right
-x 16
+x 17
 y 12
 end
+arch dwall_1_3
+x 17
+y 12
+end
+arch afloor_right
+x 17
+y 13
+end
+arch afloor_right
+x 17
+y 14
+end
 arch dwall_2_1_2
-x 16
-y 12
-end
-arch afloor_right
 x 17
+y 14
 end
-arch cwall_2_1_2
+arch grass_only
 x 17
+y 15
 end
-arch afloor_right
+arch cobblestones2
 x 17
+y 16
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
 y 1
 end
 arch afloor_right
-x 17
+x 18
 y 2
 end
+arch cwall_2_1_2
+x 18
+y 2
+end
+arch afloor_right
+x 18
+y 3
+end
+arch afloor_right
+x 18
+y 4
+end
+arch dwall_1_4
+x 18
+y 4
+end
+arch afloor_left
+x 18
+y 5
+end
+arch button_small
+x 18
+y 6
+connected 7
+end
+arch afloor_left
+x 18
+y 6
+end
+arch afloor_left
+x 18
+y 7
+end
+arch afloor_left
+x 18
+y 8
+end
+arch afloor_left
+x 18
+y 9
+end
+arch button_small
+x 18
+y 10
+connected 8
+end
+arch afloor_left
+x 18
+y 10
+end
+arch afloor_left
+x 18
+y 11
+end
+arch afloor_right
+x 18
+y 12
+end
+arch swall_2_1_2
+x 18
+y 12
+end
+arch dwall_1_4
+x 18
+y 12
+end
+arch afloor_right
+x 18
+y 13
+end
+arch afloor_right
+x 18
+y 14
+end
+arch dwall_2_1_2
+x 18
+y 14
+end
+arch grass_only
+x 18
+y 15
+end
+arch cobblestones2
+x 18
+y 16
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch light2
+x 19
+y 2
+end
+arch afloor_right
+x 19
+y 2
+end
+arch dwall_win2
+x 19
+y 2
+end
+arch light4
+x 19
+y 3
+end
+arch afloor_right
+x 19
+y 3
+end
+arch afloor_right
+x 19
+y 4
+end
 arch dwall_3_3
-x 17
-y 2
+x 19
+y 4
 end
 arch afloor_right
-x 17
-y 3
+x 19
+y 5
 end
 arch dwall_1_2
-x 17
-y 3
+x 19
+y 5
 end
 arch button_small
-x 17
-y 4
+x 19
+y 6
 connected 7
 end
 arch afloor_right
-x 17
-y 4
+x 19
+y 6
 end
 arch grate_closed_2
-x 17
-y 4
+x 19
+y 6
 speed 0.500000
 connected 7
 end
 arch afloor_right
-x 17
-y 5
+x 19
+y 7
 end
 arch dwall_1_1
-x 17
-y 5
+x 19
+y 7
 end
 arch afloor_right
-x 17
-y 6
+x 19
+y 8
 end
 arch dwall_3_2
-x 17
-y 6
+x 19
+y 8
 end
 arch afloor_right
-x 17
-y 7
+x 19
+y 9
 end
 arch dwall_1_2
-x 17
-y 7
+x 19
+y 9
 end
 arch button_small
-x 17
-y 8
+x 19
+y 10
 connected 8
 end
 arch afloor_right
-x 17
-y 8
+x 19
+y 10
 end
 arch grate_closed_2
-x 17
-y 8
+x 19
+y 10
 speed 0.500000
 connected 8
 end
 arch afloor_right
-x 17
-y 9
+x 19
+y 11
 end
 arch dwall_1_1
-x 17
-y 9
-end
-arch afloor_right
-x 17
-y 10
-end
-arch dwall_3_1
-x 17
-y 10
-end
-arch afloor_right
-x 17
+x 19
 y 11
 end
 arch afloor_right
-x 17
+x 19
 y 12
 end
-arch dwall_2_1_2
-x 17
+arch dwall_3_1
+x 19
 y 12
 end
+arch light4
+x 19
+y 13
+end
 arch afloor_right
-x 18
+x 19
+y 13
+end
+arch light2
+x 19
+y 14
+end
+arch afloor_right
+x 19
+y 14
+end
+arch dwall_win2
+x 19
+y 14
+end
+arch grass_only
+x 19
+y 15
+end
+arch cobblestones2
+x 19
+y 16
+end
+arch grass_only
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch afloor_right
+x 20
+y 2
 end
 arch cwall_2_1_2
-x 18
+x 20
+y 2
 end
 arch afloor_right
-x 18
-y 1
+x 20
+y 3
 end
 arch bed_save
-x 18
-y 1
+x 20
+y 3
 end
 arch afloor_right
-x 18
-y 2
+x 20
+y 4
 end
 arch cwall_2_1_2
-x 18
-y 2
+x 20
+y 4
 end
 arch afloor_right
-x 18
-y 3
+x 20
+y 5
 end
 arch chair_1.1
-x 18
-y 3
+x 20
+y 5
+end
+arch light4
+x 20
+y 6
 end
 arch button_small
-x 18
-y 4
+x 20
+y 6
 connected 7
 end
 arch afloor_right
-x 18
-y 4
+x 20
+y 6
 end
 arch afloor_right
-x 18
-y 5
+x 20
+y 7
 end
 arch bed_save
-x 18
-y 5
+x 20
+y 7
 end
 arch afloor_right
-x 18
-y 6
+x 20
+y 8
 end
 arch cwall_2_1_2
-x 18
-y 6
+x 20
+y 8
 end
 arch afloor_right
-x 18
-y 7
+x 20
+y 9
 end
 arch table
-x 18
-y 7
+x 20
+y 9
+end
+arch light4
+x 20
+y 10
 end
 arch button_small
-x 18
-y 8
+x 20
+y 10
 connected 8
 end
 arch afloor_right
-x 18
-y 8
-end
-arch afloor_right
-x 18
-y 9
-end
-arch bed_save
-x 18
-y 9
-end
-arch afloor_right
-x 18
-y 10
-end
-arch dwall_2_1_2
-x 18
+x 20
 y 10
 end
 arch afloor_right
-x 18
+x 20
 y 11
 end
 arch bed_save
-x 18
+x 20
 y 11
 end
 arch afloor_right
-x 18
+x 20
 y 12
 end
 arch dwall_2_1_2
-x 18
+x 20
 y 12
 end
 arch afloor_right
-x 19
+x 20
+y 13
+end
+arch bed_save
+x 20
+y 13
+end
+arch afloor_right
+x 20
+y 14
+end
+arch dwall_2_1_2
+x 20
+y 14
+end
+arch grass_only
+x 20
+y 15
+end
+arch cobblestones2
+x 20
+y 16
+end
+arch grass_only
+x 21
+end
+arch grass_only
+x 21
+y 1
+end
+arch afloor_right
+x 21
+y 2
 end
 arch dwall_2_2_3
-x 19
-end
-arch afloor_right
-x 19
-y 1
-end
-arch dwall_2_1_1
-x 19
-y 1
-end
-arch afloor_right
-x 19
-y 2
-end
-arch dwall_3_4
-x 19
+x 21
 y 2
 end
 arch afloor_right
-x 19
+x 21
 y 3
 end
 arch dwall_2_1_1
-x 19
+x 21
 y 3
 end
 arch afloor_right
-x 19
+x 21
 y 4
 end
-arch dwall_2_1_1
-x 19
+arch dwall_3_4
+x 21
 y 4
 end
 arch afloor_right
-x 19
+x 21
 y 5
 end
 arch dwall_2_1_1
-x 19
+x 21
 y 5
 end
-arch afloor_right
-x 19
-y 6
-end
-arch dwall_3_4
-x 19
+arch light2
+x 21
 y 6
 end
 arch afloor_right
-x 19
+x 21
+y 6
+end
+arch dwall_win1
+x 21
+y 6
+end
+arch afloor_right
+x 21
 y 7
 end
 arch dwall_2_1_1
-x 19
+x 21
 y 7
 end
 arch afloor_right
-x 19
+x 21
 y 8
 end
-arch dwall_2_1_1
-x 19
-y 8
-end
-arch afloor_right
-x 19
-y 9
-end
-arch dwall_2_1_1
-x 19
-y 9
-end
-arch afloor_right
-x 19
-y 10
-end
 arch dwall_3_4
-x 19
+x 21
+y 8
+end
+arch afloor_right
+x 21
+y 9
+end
+arch dwall_2_1_1
+x 21
+y 9
+end
+arch light2
+x 21
 y 10
 end
 arch afloor_right
-x 19
+x 21
+y 10
+end
+arch dwall_win1
+x 21
+y 10
+end
+arch afloor_right
+x 21
 y 11
 end
 arch dwall_2_1_1
-x 19
+x 21
 y 11
 end
 arch afloor_right
-x 19
+x 21
 y 12
 end
+arch dwall_3_4
+x 21
+y 12
+end
+arch afloor_right
+x 21
+y 13
+end
+arch dwall_2_1_1
+x 21
+y 13
+end
+arch afloor_right
+x 21
+y 14
+end
 arch dwall_2_2_4
-x 19
+x 21
+y 14
+end
+arch grass_only
+x 21
+y 15
+end
+arch cobblestones2
+x 21
+y 16
+end
+arch grass_only
+x 22
+end
+arch grass_only
+x 22
+y 1
+end
+arch grass_only
+x 22
+y 2
+end
+arch grass_only
+x 22
+y 3
+end
+arch grass_only
+x 22
+y 4
+end
+arch grass_only
+x 22
+y 5
+end
+arch grass_only
+x 22
+y 6
+end
+arch grass_only
+x 22
+y 7
+end
+arch grass_only
+x 22
+y 8
+end
+arch grass_only
+x 22
+y 9
+end
+arch grass_only
+x 22
+y 10
+end
+arch grass_only
+x 22
+y 11
+end
+arch grass_only
+x 22
 y 12
 end
+arch grass_only
+x 22
+y 13
+end
+arch grass_only
+x 22
+y 14
+end
+arch grass_only
+x 22
+y 15
+end
+arch cobblestones2
+x 22
+y 16
+end
+arch grass_only
+x 23
+end
+arch grass_only
+x 23
+y 1
+end
+arch grass_only
+x 23
+y 2
+end
+arch grass_only
+x 23
+y 3
+end
+arch grass_only
+x 23
+y 4
+end
+arch grass_only
+x 23
+y 5
+end
+arch grass_only
+x 23
+y 6
+end
+arch grass_only
+x 23
+y 7
+end
+arch grass_only
+x 23
+y 8
+end
+arch grass_only
+x 23
+y 9
+end
+arch grass_only
+x 23
+y 10
+end
+arch grass_only
+x 23
+y 11
+end
+arch grass_only
+x 23
+y 12
+end
+arch grass_only
+x 23
+y 13
+end
+arch grass_only
+x 23
+y 14
+end
+arch cobblestones2
+x 23
+y 15
+end
+arch cobblestones2
+x 23
+y 16
+end
diff --git a/world/world_101_114 b/world/world_101_114
index 94ff8e88f..747032988 100644
--- a/world/world_101_114
+++ b/world/world_101_114
@@ -4197,8 +4197,8 @@ end
 arch inn
 name Wayfarers' rest
 slaying /port_joseph/town/inn
-hp 9
-sp 12
+hp 11
+sp 13
 x 17
 y 30
 end