--- deliantra/maps/pup_land/port_w.map	2006/02/05 00:01:22	1.1.1.1
+++ deliantra/maps/pup_land/port_w.map	2009/11/03 19:26:50	1.10
@@ -1,13 +1,13 @@
 arch map
-region pupland
-name port_w
+file_format_version 1
+name Port West
+width 32
+height 20
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Jan 29 00:14:36 1996
 endmsg
-width 32
-height 20
 end
 arch sea
 end
@@ -18,117 +18,91 @@
 y 2
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 3
 end
 arch evergreens
 y 3
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 4
 end
 arch evergreens
 y 4
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 5
 end
 arch evergreens
 y 5
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 6
 end
 arch evergreens
 y 6
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 7
 end
 arch grass
 y 7
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 8
 end
 arch grass
 y 8
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 9
 end
 arch grass
 y 9
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 10
 end
 arch grass
 y 10
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 11
 end
 arch evergreens
 y 11
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 12
 end
 arch evergreens
 y 12
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 13
 end
 arch evergreens
 y 13
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 14
 end
 arch evergreens
 y 14
 end
 arch invis_exit
-slaying world
-hp 17
-sp 11
+slaying *pup_land_port_w_exit_entrance
 y 15
 end
 arch evergreens
@@ -197,6 +171,11 @@
 x 1
 y 8
 end
+arch tag
+x 1
+y 9
+tag pup_land_port_w+1+9
+end
 arch grass
 x 1
 y 9
@@ -1463,16 +1442,6 @@
 x 10
 y 9
 end
-arch magic_ear
-msg
-@match siegfried
-Click.
-endmsg
-protected 1
-connected 1
-x 10
-y 9
-end
 arch pstone_1
 x 10
 y 9
@@ -1489,18 +1458,19 @@
 name suspicious guy
 msg
 @match siegfried
+@trigger 1
 Okay, you're allowed to pass.
 @match *
 Go away!
 endmsg
 hp 180
 maxhp 180
+x 10
+y 10
 speed_left -1.750000
 pick_up 0
 friendly 1
 unaggressive 0
-x 10
-y 10
 end
 arch dungeon_magic
 x 10
@@ -1657,10 +1627,10 @@
 y 9
 end
 arch igateTrg2
-protected 1
-connected 1
 x 11
 y 9
+resist_physical 30
+connected 1
 end
 arch grass
 x 11
@@ -1829,33 +1799,24 @@
 name suspicious guy
 msg
 @match siegfried
+@trigger 1
 Okay, you're allowed to pass.
 @match *
 Go away!
 endmsg
 hp 180
 maxhp 180
+x 12
+y 8
 speed_left -1.750000
 pick_up 0
 friendly 1
 unaggressive 0
-x 12
-y 8
 end
 arch dungeon_magic
 x 12
 y 9
 end
-arch magic_ear
-msg
-@match siegfried
-Click.
-endmsg
-protected 1
-connected 1
-x 12
-y 9
-end
 arch pstone_1
 x 12
 y 9
@@ -3210,7 +3171,14 @@
 y 12
 end
 arch sea
-no_pass 0
+x 23
+y 13
+move_block -all
+end
+arch longship
+slaying port_e_house
+hp 6
+sp 6
 x 23
 y 13
 end
@@ -3302,9 +3270,9 @@
 y 12
 end
 arch sea
-no_pass 0
 x 24
 y 13
+move_block -all
 end
 arch sea
 x 24
@@ -3915,10 +3883,3 @@
 x 31
 y 19
 end
-arch longship
-slaying port_e_house
-hp 6
-sp 6
-x 23
-y 13
-end