--- deliantra/maps/pup_land/terminal.map	2006/02/05 00:01:22	1.1
+++ deliantra/maps/pup_land/terminal.map	2006/05/07 08:54:47	1.2
@@ -1,14 +1,14 @@
 arch map
 name terminal
 region pupland
+width 21
+height 18
+enter_x 10
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Fri Apr  5 02:03:21 1996
 endmsg
-width 21
-height 18
-enter_x 10
 end
 arch biglake_center
 name sky
@@ -122,15 +122,23 @@
 end
 arch biglake_center
 name sky
-no_pass 0
+x 1
+y 8
+move_block 0
+end
+arch dragon_exit
+name To Lone Town
+slaying lone_town/town
+hp 21
+sp 11
 x 1
 y 8
 end
 arch biglake_center
 name sky
-no_pass 0
 x 1
 y 9
+move_block 0
 end
 arch biglake_center
 name sky
@@ -213,9 +221,9 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 2
 y 8
+move_block 0
 end
 arch cobblestones2
 x 2
@@ -302,9 +310,9 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 3
 y 8
+move_block 0
 end
 arch cobblestones2
 x 3
@@ -613,9 +621,9 @@
 end
 arch fog
 name cloud
-blocksview 0
 x 6
 y 11
+blocksview 0
 end
 arch grass
 x 6
@@ -686,9 +694,9 @@
 end
 arch fog
 name cloud
-blocksview 0
 x 7
 y 5
+blocksview 0
 end
 arch grass
 x 7
@@ -720,9 +728,9 @@
 end
 arch fog
 name cloud
-blocksview 0
 x 7
 y 12
+blocksview 0
 end
 arch grass
 x 7
@@ -791,6 +799,13 @@
 x 8
 y 7
 end
+arch palace
+slaying hall_of_fame
+hp 6
+sp 26
+x 8
+y 7
+end
 arch cobblestones2
 x 8
 y 8
@@ -845,15 +860,23 @@
 end
 arch biglake_center
 name sky
-no_pass 0
+x 9
+y 1
+move_block 0
+end
+arch dragon_exit
+name To Scorn
+slaying /world/world_104_115
+hp 43
+sp 24
 x 9
 y 1
 end
 arch biglake_center
 name sky
-no_pass 0
 x 9
 y 2
+move_block 0
 end
 arch cobblestones2
 x 9
@@ -936,15 +959,23 @@
 end
 arch biglake_center
 name sky
-no_pass 0
+x 9
+y 15
+move_block 0
+end
+arch dragon_exit
+name To Red Island
+slaying rainbow/station
+hp 7
+sp 3
 x 9
 y 15
 end
 arch biglake_center
 name sky
-no_pass 0
 x 9
 y 16
+move_block 0
 end
 arch biglake_center
 name sky
@@ -957,9 +988,9 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 10
 y 1
+move_block 0
 end
 arch cobblestones2
 x 10
@@ -1032,15 +1063,15 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 11
 y 1
+move_block 0
 end
 arch biglake_center
 name sky
-no_pass 0
 x 11
 y 2
+move_block 0
 end
 arch cobblestones2
 x 11
@@ -1113,15 +1144,15 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 11
 y 15
+move_block 0
 end
 arch biglake_center
 name sky
-no_pass 0
 x 11
 y 16
+move_block 0
 end
 arch biglake_center
 name sky
@@ -1346,9 +1377,9 @@
 end
 arch fog
 name cloud
-blocksview 0
 x 14
 y 5
+blocksview 0
 end
 arch grass
 x 14
@@ -1364,10 +1395,10 @@
 end
 arch check_inv
 slaying regular_army
-last_sp 0
-connected 1002
 x 14
 y 9
+last_sp 0
+connected 1002
 end
 arch magic_mouth
 name No passport message
@@ -1375,29 +1406,27 @@
 You must have a Regular Army Passport to
 enter this gate. Please present your passport.
 endmsg
-connected 1002
-walk_on 0
-fly_on 0
 food 1
 x 14
 y 9
+connected 1002
+move_on 0
 end
 arch check_inv
 slaying regular_army
-connected 1001
 x 14
 y 9
+connected 1001
 end
 arch magic_mouth
 msg
 Ah! Army personnel. Please enter.
 endmsg
-connected 1001
-walk_on 0
-fly_on 0
 food 1
 x 14
 y 9
+connected 1001
+move_on 0
 end
 arch cobblestones2
 x 14
@@ -1421,9 +1450,9 @@
 end
 arch fog
 name cloud
-blocksview 0
 x 14
 y 12
+blocksview 0
 end
 arch grass
 x 14
@@ -1521,20 +1550,20 @@
 y 8
 end
 arch button_small
-connected 1001
 x 15
 y 9
+connected 1001
 end
 arch cobblestones2
 x 15
 y 9
 end
 arch grate_closed_2
+x 15
+y 9
 connected 1001
 no_magic 1
 damned 1
-x 15
-y 9
 end
 arch dungeon_magic
 x 15
@@ -1636,18 +1665,18 @@
 y 7
 end
 arch button_small
-connected 1001
 x 16
 y 8
+connected 1001
 end
 arch cobblestones2
 x 16
 y 8
 end
 arch button_small
-connected 1001
 x 16
 y 9
+connected 1001
 end
 arch cobblestones2
 x 16
@@ -1734,7 +1763,14 @@
 end
 arch biglake_center
 name sky
-no_pass 0
+x 17
+y 8
+move_block 0
+end
+arch dragon_exit
+slaying /pup_land/nurnberg/city
+hp 26
+sp 25
 x 17
 y 8
 end
@@ -1823,9 +1859,9 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 18
 y 8
+move_block 0
 end
 arch cobblestones2
 x 18
@@ -1912,15 +1948,15 @@
 end
 arch biglake_center
 name sky
-no_pass 0
 x 19
 y 8
+move_block 0
 end
 arch biglake_center
 name sky
-no_pass 0
 x 19
 y 9
+move_block 0
 end
 arch biglake_center
 name sky
@@ -2051,41 +2087,3 @@
 x 20
 y 17
 end
-arch dragon_exit
-name To Lone Town
-slaying lone_town/town
-hp 21
-sp 11
-x 1
-y 8
-end
-arch palace
-slaying hall_of_fame
-hp 6
-sp 26
-x 8
-y 7
-end
-arch dragon_exit
-name To Scorn
-slaying /world/world_104_115
-hp 43
-sp 24
-x 9
-y 1
-end
-arch dragon_exit
-name To Red Island
-slaying rainbow/station
-hp 7
-sp 3
-x 9
-y 15
-end
-arch dragon_exit
-slaying /pup_land/nurnberg/city
-hp 26
-sp 25
-x 17
-y 8
-end