--- deliantra/maps/pup_land/rainbow/w-tower.map	2006/02/05 00:01:26	1.1
+++ deliantra/maps/pup_land/rainbow/w-tower.map	2006/06/11 08:00:55	1.3
@@ -1,13 +1,13 @@
 arch map
-region pupland
 name w-tower
+region pupland
+width 20
+height 20
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Mon Jun  3 16:18:52 1996
 endmsg
-x 20
-y 20
 end
 arch woodfloor
 end
@@ -365,7 +365,7 @@
 arch a_guard_h
 name Cain, the guard
 msg
-@match T.K.
+@match t.k.
 He is my master. In his days of youth
 no monster, no quest was too hard for
 him! He collected lot's of treasure...
@@ -967,8 +967,8 @@
 name 11
 x 7
 y 18
-protected 11
 connected 11
+protected 11
 end
 arch woodfloor
 x 7
@@ -1086,7 +1086,7 @@
 arch wwall_2_1_1
 x 8
 y 17
-no_pass 0
+move_block 0
 end
 arch woodfloor
 x 8
@@ -1237,8 +1237,8 @@
 arch statue
 x 9
 y 15
+move_type walk
 can_roll 1
-move_type 1
 end
 arch woodfloor
 x 9
@@ -1247,7 +1247,7 @@
 arch wwall_2_1_2
 x 9
 y 16
-no_pass 0
+move_block 0
 end
 arch woodfloor
 x 9
@@ -1709,7 +1709,7 @@
 face sage.111
 x 13
 y 12
-no_pass 0
+move_block 0
 end
 arch woodfloor
 x 13
@@ -1809,8 +1809,8 @@
 name 10
 x 14
 y 11
-protected 10
 connected 10
+protected 10
 end
 arch woodfloor
 x 14
@@ -1928,8 +1928,8 @@
 arch statue
 x 15
 y 9
+move_type walk
 can_roll 1
-move_type 1
 end
 arch woodfloor
 x 15
@@ -1938,7 +1938,7 @@
 arch wwall_2_1_2
 x 15
 y 10
-no_pass 0
+move_block 0
 end
 arch woodfloor
 x 15
@@ -2278,18 +2278,18 @@
 x 19
 y 1
 speed 0.000000
-protected 10
 connected 10
+protected 10
 end
 arch sage
 name T.K.
 msg
-@match underground|ruin
+@match ruin|underground
 I don't know the entrance to the ruin.
 But it must be somewhere on this "Red
 Island". According to my research, the
 password for the entrance is "IN".
-@match legend|hero|four
+@match four|hero|legend
 The legends say: 
 "In former times, the islands were
 ruled by an evil lord. Then four heroes
@@ -2298,7 +2298,7 @@
 finally defeated the evil lord."
 The buildings that now lie beneath the
 ground were meant to honour the heroes.
-@match yes|adventurer
+@match adventurer|yes
 Finally. You are the kind of guy I've
 waited for. I'll tell you a secret
 about these islands: In deep
@@ -2310,20 +2310,20 @@
 @match *
 Hello. Are you an adventurer?
 endmsg
-Str 1
+str 1
 hp 100
 maxhp 100
 sp 0
 maxsp 0
 x 19
 y 1
-immune 8388607
 invisible 1
 randomitems none
 friendly 1
 unaggressive 0
 can_cast_spell 0
 can_use_skill 0
+immune 8388607
 end
 arch blocked
 x 19
@@ -2336,24 +2336,24 @@
 endmsg
 x 19
 y 3
-protected 12
 connected 12
+protected 12
 end
 arch button_small
 name 12
 x 19
 y 3
-protected 12
 weight 1000
 connected 12
+protected 12
 end
 arch creator
 name 11
 other_arch boulder
 x 19
 y 3
-protected 11
 connected 11
+protected 11
 end
 arch blocked
 x 19