--- deliantra/maps/pup_land/lone_town/town.map	2006/02/05 00:01:41	1.1
+++ deliantra/maps/pup_land/lone_town/town.map	2007/05/22 23:22:08	1.7
@@ -1,15 +1,15 @@
 arch map
+file_format_version 1
 name town
-region lonetown
+width 26
+height 20
+enter_x 5
+enter_y 18
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Jan 25 18:13:36 1996
 endmsg
-width 26
-height 20
-enter_x 5
-enter_y 18
 end
 arch grass
 end
@@ -137,6 +137,14 @@
 x 1
 y 1
 end
+arch city_tower
+name tower of Pupuly
+slaying pupuly
+hp 7
+sp 14
+x 1
+y 1
+end
 arch pstone_1
 x 1
 y 2
@@ -184,6 +192,14 @@
 x 1
 y 9
 end
+arch guild
+name Purple Butterfly's Storage Room
+slaying /pup_land/guilds/purple_butterfly/storage_room
+hp 1
+sp 10
+x 1
+y 9
+end
 arch grass
 x 1
 y 10
@@ -585,6 +601,13 @@
 x 5
 y 9
 end
+arch church
+slaying church
+hp 5
+sp 1
+x 5
+y 9
+end
 arch grass
 x 5
 y 10
@@ -690,6 +713,14 @@
 x 6
 y 12
 end
+arch guild
+name Bank of Lone
+slaying bank
+hp 9
+sp 19
+x 6
+y 12
+end
 arch grass
 x 6
 y 13
@@ -918,14 +949,26 @@
 x 8
 y 12
 end
+arch hedge_2_2_2
+x 8
+y 12
+end
 arch grass
 x 8
 y 13
 end
+arch hedge_2_1_1
+x 8
+y 13
+end
 arch grass
 x 8
 y 14
 end
+arch hedge_2_2_1
+x 8
+y 14
+end
 arch grass
 x 8
 y 15
@@ -1013,15 +1056,23 @@
 x 9
 y 12
 end
+arch hedge_2_1_2
+x 9
+y 12
+end
 arch grass
 x 9
 y 13
 end
-arch evergreens2
+arch town_portal_return
 x 9
 y 13
 end
-arch brush
+arch grass
+x 9
+y 14
+end
+arch hedge_2_1_2
 x 9
 y 14
 end
@@ -1067,6 +1118,14 @@
 x 10
 y 3
 end
+arch l_shop1
+name Tavern
+slaying tavern
+hp 12
+sp 24
+x 10
+y 3
+end
 arch grass
 x 10
 y 4
@@ -1106,6 +1165,12 @@
 x 10
 y 9
 end
+arch store_general
+name General Shop
+slaying gshop
+x 10
+y 9
+end
 arch grass
 x 10
 y 10
@@ -1118,7 +1183,7 @@
 x 10
 y 12
 end
-arch evergreens2
+arch hedge_2_2_3
 x 10
 y 12
 end
@@ -1126,7 +1191,7 @@
 x 10
 y 13
 end
-arch evergreens2
+arch hedge_2_1_1
 x 10
 y 13
 end
@@ -1134,7 +1199,11 @@
 x 10
 y 14
 end
-arch evergreens2
+arch grass
+x 10
+y 14
+end
+arch hedge_2_2_4
 x 10
 y 14
 end
@@ -1224,6 +1293,14 @@
 x 11
 y 12
 end
+arch rl_house2
+name Permanent apartments
+slaying /pup_land/lone_town/apartment/groundfloor
+hp 26
+sp 36
+x 11
+y 12
+end
 arch grass
 x 11
 y 13
@@ -1266,6 +1343,14 @@
 x 12
 y 1
 end
+arch barrack_long
+name Magic Show !
+slaying magic
+hp 7
+sp 11
+x 12
+y 1
+end
 arch cobblestones
 x 12
 y 2
@@ -1326,6 +1411,13 @@
 x 12
 y 16
 end
+arch guild
+name Guild of the Purple Butterfly
+slaying /pup_land/guilds/purple_butterfly/ground
+x 12
+y 16
+move_block -all
+end
 arch grass
 x 12
 y 17
@@ -1364,6 +1456,13 @@
 x 13
 y 3
 end
+arch store_magic
+name Magic Shop
+slaying mshop
+hp 4
+x 13
+y 3
+end
 arch grass
 x 13
 y 4
@@ -1372,6 +1471,13 @@
 x 13
 y 5
 end
+arch store_general
+name gem shop
+slaying gemshop
+sp 8
+x 13
+y 5
+end
 arch grass
 x 13
 y 6
@@ -1388,6 +1494,14 @@
 x 13
 y 9
 end
+arch guild
+name Guild of Freedom
+slaying guild_freedom
+hp 1
+sp 7
+x 13
+y 9
+end
 arch grass
 x 13
 y 10
@@ -1612,6 +1726,14 @@
 x 15
 y 9
 end
+arch guild
+name Guild of Law
+slaying guild_law
+hp 16
+sp 7
+x 15
+y 9
+end
 arch grass
 x 15
 y 10
@@ -1758,6 +1880,14 @@
 x 16
 y 16
 end
+arch house_long
+name inn
+slaying inn
+hp 9
+sp 8
+x 16
+y 16
+end
 arch grass
 x 16
 y 17
@@ -2287,6 +2417,14 @@
 x 21
 y 11
 end
+arch dragon_exit
+name Pup Airline
+slaying ../terminal
+hp 2
+sp 9
+x 21
+y 11
+end
 arch pstone_1
 x 21
 y 12
@@ -2427,6 +2565,14 @@
 x 22
 y 17
 end
+arch barn
+name Dragon Hangar
+slaying /pup_land/lone_town/dragonhangar/hangar
+hp 16
+sp 1
+x 22
+y 17
+end
 arch grass
 x 22
 y 18
@@ -2604,18 +2750,18 @@
 y 14
 end
 arch river_nw-se_u
-no_pass 0
 x 24
 y 14
+move_block -all
 end
 arch pstone_1
 x 24
 y 15
 end
 arch river_nw-e
-no_pass 0
 x 24
 y 15
+move_block -all
 end
 arch a_bridge2
 x 24
@@ -2796,126 +2942,3 @@
 x 25
 y 19
 end
-arch city_tower
-name tower of Pupuly
-slaying pupuly
-hp 7
-sp 14
-x 1
-y 1
-end
-arch guild
-name Purple Butterfly's Storage Room
-slaying /pup_land/guilds/purple_butterfly/storage_room
-hp 1
-sp 10
-x 1
-y 9
-end
-arch church
-slaying church
-hp 5
-sp 1
-x 5
-y 9
-end
-arch guild
-name Bank of Lone
-slaying bank
-hp 9
-sp 19
-x 6
-y 12
-end
-arch l_shop1
-name Tavern
-slaying tavern
-hp 12
-sp 24
-x 10
-y 3
-end
-arch store_general
-name General Shop
-slaying gshop
-x 10
-y 9
-end
-arch rl_house2
-name Permanent apartments
-slaying /pup_land/lone_town/apartment/groundfloor
-hp 26
-sp 36
-unique 1
-x 11
-y 12
-end
-arch barrack_long
-name Magic Show !
-slaying magic
-hp 7
-sp 11
-x 12
-y 1
-end
-arch guild
-name Guild of the Purple Butterfly
-slaying /pup_land/guilds/purple_butterfly/ground
-no_pass 0
-x 12
-y 16
-end
-arch store_magic
-name Magic Shop
-slaying mshop
-hp 4
-x 13
-y 3
-end
-arch store_general
-name gem shop
-slaying gemshop
-sp 8
-x 13
-y 5
-end
-arch guild
-name Guild of Freedom
-slaying guild_freedom
-hp 1
-sp 7
-x 13
-y 9
-end
-arch guild
-name Guild of Law
-slaying guild_law
-hp 16
-sp 7
-x 15
-y 9
-end
-arch house_long
-name inn
-slaying inn
-hp 9
-sp 8
-x 16
-y 16
-end
-arch dragon_exit
-name Pup Airline
-slaying ../terminal
-hp 2
-sp 9
-x 21
-y 11
-end
-arch barn
-name Dragon Hangar
-slaying /pup_land/lone_town/dragonhangar/hangar
-hp 16
-sp 1
-x 22
-y 17
-end