--- cf.schmorp.de/maps/start/tutorial_part2.map	2008/12/09 02:01:30	1.18
+++ cf.schmorp.de/maps/start/tutorial_part2.map	2008/12/23 22:34:52	1.21
@@ -857,7 +857,7 @@
 x 6
 y 9
 end
-arch wall_3_3
+arch wall_4
 x 6
 y 9
 end
@@ -982,7 +982,7 @@
 x 7
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 7
 y 4
 end
@@ -990,7 +990,7 @@
 x 7
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 7
 y 5
 end
@@ -1106,7 +1106,7 @@
 x 8
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 8
 y 4
 end
@@ -1114,7 +1114,7 @@
 x 8
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 8
 y 5
 end
@@ -1263,7 +1263,7 @@
 x 9
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 9
 y 4
 end
@@ -1271,7 +1271,7 @@
 x 9
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 9
 y 5
 end
@@ -1392,7 +1392,7 @@
 x 10
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 10
 y 4
 end
@@ -1400,7 +1400,7 @@
 x 10
 y 5
 end
-arch wall_3_3
+arch wall_4
 x 10
 y 5
 end
@@ -1540,7 +1540,7 @@
 x 11
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 11
 y 4
 end
@@ -1548,7 +1548,7 @@
 x 11
 y 5
 end
-arch wall_2_1_2
+arch wall_4
 x 11
 y 5
 end
@@ -1556,10 +1556,21 @@
 x 11
 y 6
 end
-arch wall_2_1_2
+arch wall_3_1
 x 11
 y 6
 end
+arch magic_mouth
+msg
+A voice from above says:
+
+To open the door, pick up the key you are standing on and try to walk into the door.
+
+Keyed doors automatically vanish together with the key when you have the right key in your inventory.
+endmsg
+x 11
+y 7
+end
 arch woodfloor2
 x 11
 y 7
@@ -1578,7 +1589,7 @@
 x 11
 y 8
 end
-arch wall_2_1_2
+arch wall_3_3
 x 11
 y 8
 end
@@ -1586,7 +1597,7 @@
 x 11
 y 9
 end
-arch wall_3_3
+arch wall_4
 x 11
 y 9
 end
@@ -1693,7 +1704,7 @@
 x 12
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 12
 y 4
 end
@@ -1701,7 +1712,7 @@
 x 12
 y 5
 end
-arch wall_3_3
+arch wall_4
 x 12
 y 5
 end
@@ -1827,7 +1838,7 @@
 x 13
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 13
 y 4
 end
@@ -1835,7 +1846,7 @@
 x 13
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 13
 y 5
 end
@@ -1941,7 +1952,7 @@
 x 14
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 14
 y 4
 end
@@ -1949,7 +1960,7 @@
 x 14
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 14
 y 5
 end
@@ -2106,7 +2117,7 @@
 x 15
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 4
 end
@@ -2114,7 +2125,7 @@
 x 15
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 15
 y 5
 end
@@ -2610,7 +2621,8 @@
 You can learn more about runes by looking at the runes to the west.
 
 When you are finished with the runes or don't
-want to explore them further go to east.
+want to explore them further go to east, for the
+last part of the tutorial
 endmsg
 x 18
 y 19
@@ -2816,7 +2828,7 @@
 x 20
 y 12
 end
-arch wall_2_1_1
+arch window_win1
 x 20
 y 12
 end
@@ -2848,7 +2860,7 @@
 x 20
 y 16
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 16
 end
@@ -2957,6 +2969,30 @@
 x 21
 y 11
 end
+arch grass
+x 21
+y 12
+end
+arch evergreen
+x 21
+y 13
+end
+arch grass
+x 21
+y 14
+end
+arch evergreen
+x 21
+y 15
+end
+arch woodfloor
+x 21
+y 16
+end
+arch wall_2_1_2
+x 21
+y 16
+end
 arch woodfloor
 x 22
 end
@@ -3033,10 +3069,34 @@
 x 22
 y 11
 end
-arch wall_2_1_2
+arch window_win2
 x 22
 y 11
 end
+arch grass
+x 22
+y 12
+end
+arch grass
+x 22
+y 13
+end
+arch grass
+x 22
+y 14
+end
+arch grass
+x 22
+y 15
+end
+arch woodfloor
+x 22
+y 16
+end
+arch wall_2_1_2
+x 22
+y 16
+end
 arch woodfloor
 x 23
 end
@@ -3099,6 +3159,38 @@
 x 23
 y 11
 end
+arch grass
+x 23
+y 12
+end
+arch grass
+x 23
+y 13
+end
+arch biglake_2_2_2
+x 23
+y 13
+end
+arch grass
+x 23
+y 14
+end
+arch biglake_2_2_1
+x 23
+y 14
+end
+arch evergreen
+x 23
+y 15
+end
+arch woodfloor
+x 23
+y 16
+end
+arch wall_2_1_2
+x 23
+y 16
+end
 arch woodfloor
 x 24
 end
@@ -3157,10 +3249,42 @@
 x 24
 y 11
 end
-arch wall_2_1_2
+arch window_win2
 x 24
 y 11
 end
+arch grass
+x 24
+y 12
+end
+arch grass
+x 24
+y 13
+end
+arch biglake_2_1_2
+x 24
+y 13
+end
+arch grass
+x 24
+y 14
+end
+arch biglake_2_1_2
+x 24
+y 14
+end
+arch grass
+x 24
+y 15
+end
+arch woodfloor
+x 24
+y 16
+end
+arch wall_2_1_2
+x 24
+y 16
+end
 arch woodfloor
 x 25
 end
@@ -3257,6 +3381,38 @@
 x 25
 y 11
 end
+arch grass
+x 25
+y 12
+end
+arch grass
+x 25
+y 13
+end
+arch biglake_2_2_3
+x 25
+y 13
+end
+arch grass
+x 25
+y 14
+end
+arch biglake_2_2_4
+x 25
+y 14
+end
+arch evergreen
+x 25
+y 15
+end
+arch woodfloor
+x 25
+y 16
+end
+arch wall_2_1_2
+x 25
+y 16
+end
 arch woodfloor
 x 26
 end
@@ -3319,6 +3475,30 @@
 x 26
 y 11
 end
+arch grass
+x 26
+y 12
+end
+arch grass
+x 26
+y 13
+end
+arch grass
+x 26
+y 14
+end
+arch grass
+x 26
+y 15
+end
+arch woodfloor
+x 26
+y 16
+end
+arch wall_2_1_2
+x 26
+y 16
+end
 arch woodfloor
 x 27
 end
@@ -3361,10 +3541,46 @@
 x 27
 y 9
 end
-arch wall_2_1_2
+arch window_win2
 x 27
 y 9
 end
+arch grass
+x 27
+y 10
+end
+arch grass
+x 27
+y 11
+end
+arch grass
+x 27
+y 12
+end
+arch bird
+x 27
+y 12
+end
+arch evergreen
+x 27
+y 13
+end
+arch grass
+x 27
+y 14
+end
+arch evergreen
+x 27
+y 15
+end
+arch woodfloor
+x 27
+y 16
+end
+arch wall_2_1_2
+x 27
+y 16
+end
 arch woodfloor
 x 28
 end
@@ -3439,7 +3655,63 @@
 x 28
 y 9
 end
-arch wall_2_2_4
+arch wall_3_4
 x 28
 y 9
 end
+arch woodfloor
+x 28
+y 10
+end
+arch wall_2_1_1
+x 28
+y 10
+end
+arch woodfloor
+x 28
+y 11
+end
+arch wall_2_1_1
+x 28
+y 11
+end
+arch woodfloor
+x 28
+y 12
+end
+arch wall_2_1_1
+x 28
+y 12
+end
+arch woodfloor
+x 28
+y 13
+end
+arch wall_2_1_1
+x 28
+y 13
+end
+arch woodfloor
+x 28
+y 14
+end
+arch wall_2_1_1
+x 28
+y 14
+end
+arch woodfloor
+x 28
+y 15
+end
+arch wall_2_1_1
+x 28
+y 15
+end
+arch woodfloor
+x 28
+y 16
+end
+arch wall_2_2_4
+x 28
+y 16
+end