--- cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/09 11:42:56	1.20
+++ cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/23 22:34:52	1.23
@@ -476,6 +476,8 @@
 of these kinds of triggers that might open
 a way out for you.
 
+(Remember that you can pick up items by
+pressing C<,>, the B<comma>-key)
 endmsg
 x 3
 y 8
@@ -706,7 +708,7 @@
 x 4
 y 19
 end
-arch wall_2_2_1
+arch wall_2_1_1
 x 4
 y 19
 end
@@ -714,6 +716,10 @@
 x 4
 y 20
 end
+arch wall_2_2_1
+x 4
+y 20
+end
 arch woodfloor
 x 4
 y 21
@@ -723,7 +729,7 @@
 y 22
 end
 arch sign
-name Triggering Buttons with Weights
+name Next step: Class Selection
 msg
 The portal to the south will bring you to the class
 selection, where you have to choose a class for your
@@ -864,15 +870,15 @@
 x 5
 y 18
 end
-arch woodfloor
+arch grass
 x 5
 y 19
 end
-arch wall_2_1_2
+arch woodfloor
 x 5
-y 19
+y 20
 end
-arch woodfloor
+arch window_win2
 x 5
 y 20
 end
@@ -947,7 +953,7 @@
 x 6
 y 8
 end
-arch wall_2_1_1
+arch wall_3_2
 x 6
 y 8
 end
@@ -955,7 +961,7 @@
 x 6
 y 9
 end
-arch wall_2_1_1
+arch wall_3_2
 x 6
 y 9
 end
@@ -963,7 +969,7 @@
 x 6
 y 10
 end
-arch wall_2_1_1
+arch wall_3_2
 x 6
 y 10
 end
@@ -971,7 +977,7 @@
 x 6
 y 11
 end
-arch wall_2_1_1
+arch wall_3_2
 x 6
 y 11
 end
@@ -979,7 +985,7 @@
 x 6
 y 12
 end
-arch wall_2_1_1
+arch wall_3_2
 x 6
 y 12
 end
@@ -1019,15 +1025,15 @@
 x 6
 y 18
 end
-arch woodfloor
+arch grass
 x 6
 y 19
 end
-arch window_win2
+arch woodfloor
 x 6
-y 19
+y 20
 end
-arch woodfloor
+arch wall_2_2_3
 x 6
 y 20
 end
@@ -1035,19 +1041,31 @@
 x 6
 y 21
 end
+arch wall_2_1_1
+x 6
+y 21
+end
 arch woodfloor
 x 6
 y 22
 end
+arch window_win1
+x 6
+y 22
+end
 arch woodfloor
 x 6
 y 23
 end
+arch wall_2_1_1
+x 6
+y 23
+end
 arch woodfloor
 x 6
 y 24
 end
-arch wall_2_1_2
+arch wall_2_2_4
 x 6
 y 24
 end
@@ -1117,7 +1135,7 @@
 x 7
 y 8
 end
-arch wall_2_1_1
+arch wall_3_4
 x 7
 y 8
 end
@@ -1125,7 +1143,7 @@
 x 7
 y 9
 end
-arch wall_2_1_1
+arch wall_3_4
 x 7
 y 9
 end
@@ -1133,7 +1151,7 @@
 x 7
 y 10
 end
-arch wall_2_1_1
+arch wall_3_4
 x 7
 y 10
 end
@@ -1141,7 +1159,7 @@
 x 7
 y 11
 end
-arch wall_2_2_1
+arch wall_4
 x 7
 y 11
 end
@@ -1149,11 +1167,15 @@
 x 7
 y 12
 end
+arch wall_4
+x 7
+y 12
+end
 arch woodfloor
 x 7
 y 13
 end
-arch wall_2_1_2
+arch wall_3_1
 x 7
 y 13
 end
@@ -1181,35 +1203,27 @@
 x 7
 y 18
 end
-arch woodfloor
-x 7
-y 19
-end
-arch wall_2_1_2
+arch grass
 x 7
 y 19
 end
-arch woodfloor
+arch grass
 x 7
 y 20
 end
-arch woodfloor
+arch grass
 x 7
 y 21
 end
-arch woodfloor
+arch grass
 x 7
 y 22
 end
-arch woodfloor
+arch grass
 x 7
 y 23
 end
-arch woodfloor
-x 7
-y 24
-end
-arch wall_2_1_2
+arch evergreen
 x 7
 y 24
 end
@@ -1348,7 +1362,7 @@
 x 8
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 8
 y 11
 end
@@ -1356,11 +1370,15 @@
 x 8
 y 12
 end
+arch wall_4
+x 8
+y 12
+end
 arch woodfloor
 x 8
 y 13
 end
-arch wall_2_1_2
+arch wall_3_1
 x 8
 y 13
 end
@@ -1388,51 +1406,27 @@
 x 8
 y 18
 end
-arch woodfloor
-x 8
-y 19
-end
-arch wall_2_2_3
+arch grass
 x 8
 y 19
 end
-arch woodfloor
-x 8
-y 20
-end
-arch wall_2_1_1
+arch grass
 x 8
 y 20
 end
-arch woodfloor
-x 8
-y 21
-end
-arch window_win1
+arch grass
 x 8
 y 21
 end
-arch woodfloor
-x 8
-y 22
-end
-arch wall_2_1_1
+arch grass
 x 8
 y 22
 end
-arch woodfloor
-x 8
-y 23
-end
-arch wall_2_1_1
+arch grass
 x 8
 y 23
 end
-arch woodfloor
-x 8
-y 24
-end
-arch wall_2_2_4
+arch evergreen
 x 8
 y 24
 end
@@ -1530,7 +1524,7 @@
 x 9
 y 12
 end
-arch wall_2_1_1
+arch wall_3_4
 x 9
 y 12
 end
@@ -1612,7 +1606,7 @@
 x 10
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 10
 y 4
 end
@@ -1620,7 +1614,7 @@
 x 10
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 10
 y 5
 end
@@ -1823,7 +1817,7 @@
 x 11
 y 17
 end
-arch wall_3_1
+arch wall_2_2_4
 x 11
 y 17
 end
@@ -1939,7 +1933,7 @@
 x 12
 y 13
 end
-arch wall_2_1_2
+arch wall_3_3
 x 12
 y 13
 end
@@ -1947,7 +1941,7 @@
 x 12
 y 14
 end
-arch wall_2_1_2
+arch wall_3_1
 x 12
 y 14
 end
@@ -1968,11 +1962,7 @@
 x 12
 y 16
 end
-arch woodfloor
-x 12
-y 17
-end
-arch wall_2_1_2
+arch grass
 x 12
 y 17
 end
@@ -2124,7 +2114,7 @@
 x 13
 y 17
 end
-arch wall_3_1
+arch wall_2_2_1
 x 13
 y 17
 end
@@ -2187,9 +2177,9 @@
 A message scrawled on the floor says:
 
 This is a standard food.  You can apply it while
-it's on the ground, the same way you apply
+it's on the ground (B<space>-key), the same way you apply
 signs and other objects, or you can pick it up
-and take it with you.
+(by pressing C<,>, the B<comma>-key) and take it with you.
 endmsg
 x 14
 y 2
@@ -2210,7 +2200,7 @@
 x 14
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 14
 y 4
 end
@@ -2218,7 +2208,7 @@
 x 14
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 14
 y 5
 end
@@ -2356,7 +2346,7 @@
 x 15
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 4
 end
@@ -2364,7 +2354,7 @@
 x 15
 y 5
 end
-arch wall_3_3
+arch wall_4
 x 15
 y 5
 end
@@ -2412,7 +2402,7 @@
 x 15
 y 12
 end
-arch wall_2_1_1
+arch wall_3_2
 x 15
 y 12
 end
@@ -2511,6 +2501,8 @@
 poisonous, so to be safe, don't eat food until
 you've identified it.  (More on identifying items
 later.)
+
+You can pick it up by pressing C<,> (the B<comma>-key).
 endmsg
 x 16
 y 2
@@ -2531,7 +2523,7 @@
 x 16
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 16
 y 4
 end
@@ -2539,7 +2531,7 @@
 x 16
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 16
 y 5
 end
@@ -2571,7 +2563,7 @@
 x 16
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 16
 y 11
 end
@@ -2579,11 +2571,15 @@
 x 16
 y 12
 end
+arch wall_4
+x 16
+y 12
+end
 arch woodfloor
 x 16
 y 13
 end
-arch wall_2_1_2
+arch wall_3_1
 x 16
 y 13
 end
@@ -2673,7 +2669,7 @@
 x 17
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 17
 y 4
 end
@@ -2681,7 +2677,7 @@
 x 17
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 17
 y 5
 end
@@ -2721,7 +2717,7 @@
 x 17
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 17
 y 11
 end
@@ -2729,11 +2725,15 @@
 x 17
 y 12
 end
+arch wall_4
+x 17
+y 12
+end
 arch woodfloor
 x 17
 y 13
 end
-arch wall_2_2_3
+arch wall_4
 x 17
 y 13
 end
@@ -2828,6 +2828,8 @@
 When you kill monsters, sometimes they leave
 body parts behind, and these can be taken and
 eaten also.
+
+You can pick it up by pressing C<,> (the B<comma>-key).
 endmsg
 x 18
 y 2
@@ -2849,7 +2851,7 @@
 x 18
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 18
 y 4
 end
@@ -2857,7 +2859,7 @@
 x 18
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 18
 y 5
 end
@@ -2897,7 +2899,7 @@
 x 18
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 18
 y 11
 end
@@ -2905,15 +2907,23 @@
 x 18
 y 12
 end
+arch wall_4
+x 18
+y 12
+end
 arch woodfloor
 x 18
 y 13
 end
+arch wall_4
+x 18
+y 13
+end
 arch woodfloor
 x 18
 y 14
 end
-arch wall_2_1_2
+arch wall_3_1
 x 18
 y 14
 end
@@ -3000,7 +3010,7 @@
 x 19
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 19
 y 4
 end
@@ -3008,7 +3018,7 @@
 x 19
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 19
 y 5
 end
@@ -3045,7 +3055,7 @@
 x 19
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 19
 y 11
 end
@@ -3053,11 +3063,15 @@
 x 19
 y 12
 end
+arch wall_4
+x 19
+y 12
+end
 arch woodfloor
 x 19
 y 13
 end
-arch wall_2_2_2
+arch wall_4
 x 19
 y 13
 end
@@ -3139,11 +3153,14 @@
 
 Waybreads are the MRE (Meals-Ready-to-Eat)
 of Deliantra. They weigh very little but pack
-a large food value.  They are much more
+a large food value. They are much more
 expensive than normal food, but when you
 can afford them, they are the best food to
 take on long trips or dungeon excursions,
 since their light weight won't slow you down.
+
+You can pick it up by pressing C<,> (the B<comma>-key) and eat
+it later by applying it from your inventory in the B<player book>.
 endmsg
 x 20
 y 2
@@ -3164,7 +3181,7 @@
 x 20
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 20
 y 4
 end
@@ -3172,7 +3189,7 @@
 x 20
 y 5
 end
-arch wall_2_2_3
+arch wall_4
 x 20
 y 5
 end
@@ -3180,7 +3197,7 @@
 x 20
 y 6
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 6
 end
@@ -3188,7 +3205,7 @@
 x 20
 y 7
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 7
 end
@@ -3196,7 +3213,7 @@
 x 20
 y 8
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 8
 end
@@ -3204,7 +3221,7 @@
 x 20
 y 9
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 9
 end
@@ -3212,7 +3229,7 @@
 x 20
 y 10
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 10
 end
@@ -3220,7 +3237,7 @@
 x 20
 y 11
 end
-arch wall_2_2_4
+arch wall_4
 x 20
 y 11
 end
@@ -3228,11 +3245,15 @@
 x 20
 y 12
 end
+arch wall_4
+x 20
+y 12
+end
 arch woodfloor
 x 20
 y 13
 end
-arch wall_2_1_2
+arch wall_3_1
 x 20
 y 13
 end
@@ -3314,7 +3335,7 @@
 x 21
 y 5
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 5
 end
@@ -3322,7 +3343,7 @@
 x 21
 y 6
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 6
 end
@@ -3330,7 +3351,7 @@
 x 21
 y 7
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 7
 end
@@ -3338,7 +3359,7 @@
 x 21
 y 8
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 8
 end
@@ -3346,7 +3367,7 @@
 x 21
 y 9
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 9
 end
@@ -3354,7 +3375,7 @@
 x 21
 y 10
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 10
 end
@@ -3362,7 +3383,7 @@
 x 21
 y 11
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 11
 end
@@ -3370,7 +3391,7 @@
 x 21
 y 12
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 12
 end