--- deliantra/maps/aldwulf/water_town.map	2006/03/23 07:05:19	1.2
+++ deliantra/maps/aldwulf/water_town.map	2007/01/09 00:51:01	1.7
@@ -1,16 +1,16 @@
 arch map
 name water_town
+reset_timeout 7200
+difficulty 2
+width 32
+height 32
+enter_x 1
+enter_y 1
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Wed Feb  6 20:34:01 2002
 endmsg
-difficulty 2
-enter_x 1
-enter_y 1
-height 32
-reset_timeout 7200
-width 32
 end
 arch sea
 end
@@ -1746,7 +1746,7 @@
 x 13
 y 19
 type 0
-move_type 1
+move_type walk
 monster 1
 unaggressive 1
 end
@@ -1781,6 +1781,7 @@
 arch barrel
 x 13
 y 22
+no_pick 1
 end
 arch sea1
 x 13
@@ -1976,6 +1977,7 @@
 arch barrel
 x 14
 y 23
+no_pick 1
 end
 arch sea1
 x 14
@@ -2108,7 +2110,7 @@
 end
 arch swashbuckler
 msg
-@match smaug|Smaug
+@match smaug
 Yea! Smaug. One of the oldest and
 most horrible dragons all over the
 world. You should be careful when
@@ -2123,7 +2125,7 @@
 x 15
 y 15
 type 0
-move_type 1
+move_type walk
 monster 1
 unaggressive 1
 end
@@ -2190,6 +2192,7 @@
 arch barrel
 x 15
 y 23
+no_pick 1
 end
 arch sea1
 x 15
@@ -2313,6 +2316,8 @@
 arch barrel
 x 16
 y 15
+invisible 0
+no_pick 1
 end
 arch sea1
 x 16
@@ -2985,6 +2990,7 @@
 arch barrel
 x 20
 y 17
+no_pick 1
 end
 arch sea1
 x 20
@@ -2997,6 +3003,7 @@
 arch barrel
 x 20
 y 18
+no_pick 1
 end
 arch sea1
 x 20
@@ -3469,6 +3476,15 @@
 x 23
 y 15
 end
+arch northman
+msg
+@match *
+Hugh! Brrrrr
+endmsg
+x 23
+y 15
+unaggressive 1
+end
 arch sea1
 x 23
 y 16
@@ -3788,12 +3804,11 @@
 x 25
 y 15
 end
-arch northman
-x 25
-y 15
-unaggressive 1
-end
 arch longship
+name longship to Scorn
+slaying /world/world_104_115
+hp 44
+sp 19
 x 25
 y 15
 end
@@ -3830,11 +3845,21 @@
 y 20
 end
 arch viking
+msg
+@match *
+Would you like to go to Kobold
+Archipelago? Take the galleon
+at the end of the pier. Go quickly,
+this town isn't safe anymore.
+@match danger|safe
+We are getting attacked by Smaug the
+dragon. Nobody dares to face him.
+endmsg
 hp 50
 x 25
 y 20
 type 0
-move_type 1
+move_type walk
 monster 1
 unaggressive 1
 end
@@ -3980,6 +4005,7 @@
 arch barrel
 x 26
 y 20
+no_pick 1
 end
 arch sea1
 x 26