--- cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/09 02:10:21	1.19
+++ cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/23 22:34:52	1.23
@@ -1,7 +1,7 @@
 arch map
 name Tutorial Part1
 width 28
-height 20
+height 25
 enter_x 8
 enter_y 1
 per_player 1
@@ -101,9 +101,39 @@
 arch woodfloor
 y 19
 end
-arch wall_2_2_1
+arch wall_2_1_1
 y 19
 end
+arch woodfloor
+y 20
+end
+arch wall_2_1_1
+y 20
+end
+arch woodfloor
+y 21
+end
+arch wall_2_1_1
+y 21
+end
+arch woodfloor
+y 22
+end
+arch wall_2_1_1
+y 22
+end
+arch woodfloor
+y 23
+end
+arch wall_2_1_1
+y 23
+end
+arch woodfloor
+y 24
+end
+arch wall_2_2_1
+y 24
+end
 arch evergreen
 x 1
 end
@@ -171,11 +201,6 @@
 x 1
 y 9
 end
-arch spikes_closed
-x 1
-y 9
-connected 3
-end
 arch woodfloor
 x 1
 y 10
@@ -184,14 +209,29 @@
 x 1
 y 11
 end
+arch spikes_closed
+x 1
+y 11
+connected 3
+end
 arch woodfloor
 x 1
 y 12
 end
+arch spikes_closed
+x 1
+y 12
+connected 3
+end
 arch woodfloor
 x 1
 y 13
 end
+arch spikes_closed
+x 1
+y 13
+connected 3
+end
 arch woodfloor
 x 1
 y 14
@@ -216,9 +256,29 @@
 x 1
 y 19
 end
+arch woodfloor
+x 1
+y 20
+end
+arch woodfloor
+x 1
+y 21
+end
+arch woodfloor
+x 1
+y 22
+end
+arch woodfloor
+x 1
+y 23
+end
+arch woodfloor
+x 1
+y 24
+end
 arch wall_2_1_2
 x 1
-y 19
+y 24
 end
 arch evergreen
 x 2
@@ -275,11 +335,6 @@
 x 2
 y 9
 end
-arch spikes_closed
-x 2
-y 9
-connected 3
-end
 arch woodfloor
 x 2
 y 10
@@ -288,41 +343,73 @@
 x 2
 y 11
 end
+arch swall_2_2_2
+x 2
+y 11
+end
 arch woodfloor
 x 2
 y 12
 end
+arch swall_2_1_1
+x 2
+y 12
+end
 arch woodfloor
 x 2
 y 13
 end
+arch swall_1_2
+x 2
+y 13
+end
 arch woodfloor
 x 2
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 15
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 16
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 17
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 18
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 19
 end
+arch woodfloor2
+x 2
+y 20
+end
+arch woodfloor2
+x 2
+y 21
+end
+arch woodfloor2
+x 2
+y 22
+end
+arch woodfloor
+x 2
+y 23
+end
+arch woodfloor
+x 2
+y 24
+end
 arch wall_2_1_2
 x 2
-y 19
+y 24
 end
 arch evergreen
 x 3
@@ -389,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
@@ -397,35 +486,42 @@
 x 3
 y 9
 end
-arch spikes_closed
+arch woodfloor
 x 3
-y 9
-connected 3
+y 10
 end
 arch woodfloor
 x 3
-y 10
+y 11
+end
+arch swall_2_1_2
+x 3
+y 11
+end
+arch woodfloor
+x 3
+y 12
 end
 arch button_plate
 x 3
-y 10
+y 12
 connected 3
 end
 arch woodfloor
 x 3
-y 11
+y 13
 end
 arch boulder
 x 3
-y 11
+y 13
 end
 arch woodfloor
 x 3
-y 12
+y 14
 end
-arch woodfloor
+arch woodfloor2
 x 3
-y 13
+y 15
 end
 arch sign
 name Triggering Buttons with Weights
@@ -443,35 +539,47 @@
 weak characters can push things if they are persistent.
 endmsg
 x 3
-y 13
+y 15
 end
 arch woodfloor
 x 3
-y 14
+y 16
 end
 arch woodfloor
 x 3
-y 15
+y 17
 end
 arch woodfloor
 x 3
-y 16
+y 18
 end
 arch woodfloor
 x 3
-y 17
+y 19
 end
 arch woodfloor
 x 3
-y 18
+y 20
 end
 arch woodfloor
 x 3
-y 19
+y 21
+end
+arch woodfloor2
+x 3
+y 22
+end
+arch woodfloor
+x 3
+y 23
+end
+arch woodfloor
+x 3
+y 24
 end
 arch wall_1_3
 x 3
-y 19
+y 24
 end
 arch evergreen
 x 4
@@ -540,11 +648,6 @@
 x 4
 y 9
 end
-arch spikes_closed
-x 4
-y 9
-connected 3
-end
 arch woodfloor
 x 4
 y 10
@@ -553,14 +656,26 @@
 x 4
 y 11
 end
+arch swall_2_2_3
+x 4
+y 11
+end
 arch woodfloor
 x 4
 y 12
 end
+arch swall_2_1_1
+x 4
+y 12
+end
 arch woodfloor
 x 4
 y 13
 end
+arch swall_1_2
+x 4
+y 13
+end
 arch woodfloor
 x 4
 y 14
@@ -569,8 +684,52 @@
 x 4
 y 15
 end
+arch woodfloor
+x 4
+y 16
+end
+arch woodfloor
+x 4
+y 17
+end
+arch wall_2_2_2
+x 4
+y 17
+end
+arch woodfloor
+x 4
+y 18
+end
+arch wall_2_1_1
+x 4
+y 18
+end
+arch woodfloor
+x 4
+y 19
+end
+arch wall_2_1_1
+x 4
+y 19
+end
+arch woodfloor
+x 4
+y 20
+end
+arch wall_2_2_1
+x 4
+y 20
+end
+arch woodfloor
+x 4
+y 21
+end
+arch woodfloor2
+x 4
+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
@@ -580,30 +739,22 @@
 in the north?
 endmsg
 x 4
-y 15
+y 22
 end
 arch woodfloor2
 x 4
-y 16
+y 23
 end
 arch woodfloor2
 x 4
-y 17
-end
-arch woodfloor2
-x 4
-y 18
-end
-arch woodfloor2
-x 4
-y 19
+y 24
 end
 arch exit
 slaying tutorial_class
 hp 4
 sp 1
 x 4
-y 19
+y 24
 end
 arch evergreen
 x 5
@@ -664,11 +815,6 @@
 x 5
 y 9
 end
-arch spikes_closed
-x 5
-y 9
-connected 3
-end
 arch woodfloor
 x 5
 y 10
@@ -677,14 +823,29 @@
 x 5
 y 11
 end
+arch spikes_closed
+x 5
+y 11
+connected 3
+end
 arch woodfloor
 x 5
 y 12
 end
+arch spikes_closed
+x 5
+y 12
+connected 3
+end
 arch woodfloor
 x 5
 y 13
 end
+arch spikes_closed
+x 5
+y 13
+connected 3
+end
 arch woodfloor
 x 5
 y 14
@@ -701,17 +862,45 @@
 x 5
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
+x 5
+y 17
+end
+arch grass
 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 window_win2
+x 5
+y 20
+end
+arch woodfloor
+x 5
+y 21
+end
+arch woodfloor
+x 5
+y 22
+end
+arch woodfloor
+x 5
+y 23
+end
+arch woodfloor
+x 5
+y 24
+end
+arch wall_1_4
+x 5
+y 24
 end
 arch evergreen
 x 6
@@ -756,7 +945,7 @@
 x 6
 y 7
 end
-arch window_win2
+arch wall_3_3
 x 6
 y 7
 end
@@ -764,31 +953,50 @@
 x 6
 y 8
 end
+arch wall_3_2
+x 6
+y 8
+end
 arch woodfloor
 x 6
 y 9
 end
-arch spikes_closed
+arch wall_3_2
 x 6
 y 9
-connected 3
 end
 arch woodfloor
 x 6
 y 10
 end
+arch wall_3_2
+x 6
+y 10
+end
 arch woodfloor
 x 6
 y 11
 end
+arch wall_3_2
+x 6
+y 11
+end
 arch woodfloor
 x 6
 y 12
 end
+arch wall_3_2
+x 6
+y 12
+end
 arch woodfloor
 x 6
 y 13
 end
+arch wall_2_2_1
+x 6
+y 13
+end
 arch woodfloor
 x 6
 y 14
@@ -805,19 +1013,63 @@
 x 6
 y 17
 end
-arch woodfloor
+arch window_win2
+x 6
+y 17
+end
+arch grass
 x 6
 y 18
 end
-arch woodfloor
+arch phole_1
 x 6
-y 19
+y 18
 end
-arch wall_2_1_2
+arch grass
 x 6
 y 19
 end
 arch woodfloor
+x 6
+y 20
+end
+arch wall_2_2_3
+x 6
+y 20
+end
+arch woodfloor
+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_2_4
+x 6
+y 24
+end
+arch woodfloor
 x 7
 end
 arch wall_2_2_2
@@ -883,7 +1135,7 @@
 x 7
 y 8
 end
-arch wall_2_1_1
+arch wall_3_4
 x 7
 y 8
 end
@@ -891,7 +1143,7 @@
 x 7
 y 9
 end
-arch wall_2_1_1
+arch wall_3_4
 x 7
 y 9
 end
@@ -899,7 +1151,7 @@
 x 7
 y 10
 end
-arch wall_2_1_1
+arch wall_3_4
 x 7
 y 10
 end
@@ -907,7 +1159,7 @@
 x 7
 y 11
 end
-arch wall_2_2_1
+arch wall_4
 x 7
 y 11
 end
@@ -915,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_2_2
+arch wall_3_1
 x 7
 y 13
 end
@@ -927,50 +1183,49 @@
 x 7
 y 14
 end
-arch wall_2_2_1
-x 7
-y 14
-end
 arch woodfloor2
 x 7
 y 15
 end
-arch button_handle
-x 7
-y 15
-connected 5
-end
 arch woodfloor
 x 7
 y 16
 end
-arch wall_2_2_2
-x 7
-y 16
-end
 arch woodfloor
 x 7
 y 17
 end
-arch wall_2_1_1
+arch wall_2_1_2
 x 7
 y 17
 end
-arch woodfloor
+arch grass
 x 7
 y 18
 end
-arch wall_2_1_1
+arch grass
 x 7
-y 18
+y 19
 end
-arch woodfloor
+arch grass
 x 7
-y 19
+y 20
 end
-arch wall_2_2_4
+arch grass
 x 7
-y 19
+y 21
+end
+arch grass
+x 7
+y 22
+end
+arch grass
+x 7
+y 23
+end
+arch evergreen
+x 7
+y 24
 end
 arch woodfloor
 x 8
@@ -1107,7 +1362,7 @@
 x 8
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 8
 y 11
 end
@@ -1115,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
@@ -1127,38 +1386,49 @@
 x 8
 y 14
 end
-arch wall_2_1_2
-x 8
-y 14
-end
 arch woodfloor2
 x 8
 y 15
 end
-arch grate_closed_2
+arch woodfloor
 x 8
-y 15
-connected 5
+y 16
 end
 arch woodfloor
 x 8
-y 16
+y 17
 end
 arch wall_2_1_2
 x 8
-y 16
+y 17
 end
 arch grass
 x 8
-y 17
+y 18
 end
 arch grass
 x 8
-y 18
+y 19
+end
+arch grass
+x 8
+y 20
+end
+arch grass
+x 8
+y 21
+end
+arch grass
+x 8
+y 22
+end
+arch grass
+x 8
+y 23
 end
 arch evergreen
 x 8
-y 19
+y 24
 end
 arch woodfloor
 x 9
@@ -1246,7 +1516,7 @@
 x 9
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 9
 y 11
 end
@@ -1254,11 +1524,15 @@
 x 9
 y 12
 end
+arch wall_3_4
+x 9
+y 12
+end
 arch woodfloor
 x 9
 y 13
 end
-arch wall_2_2_3
+arch wall_2_2_4
 x 9
 y 13
 end
@@ -1266,33 +1540,19 @@
 x 9
 y 14
 end
-arch wall_2_2_4
-x 9
-y 14
-end
 arch woodfloor2
 x 9
 y 15
 end
-arch button_handle
-name handle (press space to apply)
-x 9
-y 15
-connected 5
-end
 arch woodfloor
 x 9
 y 16
 end
-arch wall_2_2_3
-x 9
-y 16
-end
 arch woodfloor
 x 9
 y 17
 end
-arch wall_2_2_1
+arch window_win2
 x 9
 y 17
 end
@@ -1300,10 +1560,30 @@
 x 9
 y 18
 end
-arch evergreen
+arch grass
 x 9
 y 19
 end
+arch grass
+x 9
+y 20
+end
+arch grass
+x 9
+y 21
+end
+arch grass
+x 9
+y 22
+end
+arch grass
+x 9
+y 23
+end
+arch evergreen
+x 9
+y 24
+end
 arch woodfloor
 x 10
 end
@@ -1326,7 +1606,7 @@
 x 10
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 10
 y 4
 end
@@ -1334,7 +1614,7 @@
 x 10
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 10
 y 5
 end
@@ -1374,14 +1654,6 @@
 x 10
 y 12
 end
-arch sign_w
-name Trouble with the Lever?
-msg
-If you have trouble with the lever you can go this way.
-endmsg
-x 10
-y 12
-end
 arch woodfloor
 x 10
 y 13
@@ -1410,10 +1682,30 @@
 x 10
 y 18
 end
-arch evergreen
+arch grass
 x 10
 y 19
 end
+arch grass
+x 10
+y 20
+end
+arch grass
+x 10
+y 21
+end
+arch grass
+x 10
+y 22
+end
+arch grass
+x 10
+y 23
+end
+arch evergreen
+x 10
+y 24
+end
 arch woodfloor
 x 11
 end
@@ -1480,7 +1772,7 @@
 x 11
 y 11
 end
-arch wall_3_3
+arch wall_2_1_2
 x 11
 y 11
 end
@@ -1488,15 +1780,11 @@
 x 11
 y 12
 end
-arch wall_2_1_1
-x 11
-y 12
-end
 arch woodfloor
 x 11
 y 13
 end
-arch wall_2_2_1
+arch wall_2_2_2
 x 11
 y 13
 end
@@ -1504,19 +1792,32 @@
 x 11
 y 14
 end
+arch wall_2_2_1
+x 11
+y 14
+end
 arch woodfloor2
 x 11
 y 15
 end
+arch button_handle
+x 11
+y 15
+connected 5
+end
 arch woodfloor
 x 11
 y 16
 end
+arch wall_2_2_2
+x 11
+y 16
+end
 arch woodfloor
 x 11
 y 17
 end
-arch window_win2
+arch wall_2_2_4
 x 11
 y 17
 end
@@ -1524,10 +1825,38 @@
 x 11
 y 18
 end
-arch evergreen
+arch grass
 x 11
 y 19
 end
+arch grass
+x 11
+y 20
+end
+arch tree7
+x 11
+y 20
+end
+arch grasspond
+x 11
+y 21
+end
+arch grass
+x 11
+y 22
+end
+arch bird
+x 11
+y 22
+end
+arch grass
+x 11
+y 23
+end
+arch evergreen
+x 11
+y 24
+end
 arch woodfloor
 x 12
 end
@@ -1604,7 +1933,7 @@
 x 12
 y 13
 end
-arch wall_2_1_2
+arch wall_3_3
 x 12
 y 13
 end
@@ -1612,27 +1941,28 @@
 x 12
 y 14
 end
+arch wall_3_1
+x 12
+y 14
+end
 arch woodfloor2
 x 12
 y 15
 end
-arch sign
-name Levers
-msg
-Some gates and doors are opened by levers. Apply (press space bar) the lever to your south to continue.
-endmsg
+arch grate_closed_2
 x 12
 y 15
+connected 5
 end
 arch woodfloor
 x 12
 y 16
 end
-arch woodfloor
+arch wall_2_1_2
 x 12
-y 17
+y 16
 end
-arch wall_2_1_2
+arch grass
 x 12
 y 17
 end
@@ -1640,10 +1970,38 @@
 x 12
 y 18
 end
-arch evergreen
+arch grass
 x 12
 y 19
 end
+arch grass
+x 12
+y 20
+end
+arch grass
+x 12
+y 21
+end
+arch biglake_2_2_2
+x 12
+y 21
+end
+arch grass
+x 12
+y 22
+end
+arch biglake_2_2_1
+x 12
+y 22
+end
+arch grass
+x 12
+y 23
+end
+arch evergreen
+x 12
+y 24
+end
 arch woodfloor
 x 13
 end
@@ -1722,7 +2080,7 @@
 x 13
 y 13
 end
-arch wall_2_1_2
+arch wall_2_2_3
 x 13
 y 13
 end
@@ -1730,19 +2088,33 @@
 x 13
 y 14
 end
+arch wall_2_2_4
+x 13
+y 14
+end
 arch woodfloor2
 x 13
 y 15
 end
+arch button_handle
+name handle (press space to apply)
+x 13
+y 15
+connected 5
+end
 arch woodfloor
 x 13
 y 16
 end
+arch wall_2_2_3
+x 13
+y 16
+end
 arch woodfloor
 x 13
 y 17
 end
-arch window_win2
+arch wall_2_2_1
 x 13
 y 17
 end
@@ -1750,10 +2122,46 @@
 x 13
 y 18
 end
-arch evergreen
+arch grass
 x 13
 y 19
 end
+arch grass
+x 13
+y 20
+end
+arch biglake_2_2_2
+x 13
+y 20
+end
+arch grass
+x 13
+y 21
+end
+arch biglake_4
+x 13
+y 21
+end
+arch grass
+x 13
+y 22
+end
+arch biglake_4
+x 13
+y 22
+end
+arch grass
+x 13
+y 23
+end
+arch biglake_2_2_1
+x 13
+y 23
+end
+arch evergreen
+x 13
+y 24
+end
 arch woodfloor
 x 14
 end
@@ -1769,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
@@ -1792,7 +2200,7 @@
 x 14
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 14
 y 4
 end
@@ -1800,7 +2208,7 @@
 x 14
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 14
 y 5
 end
@@ -1840,11 +2248,15 @@
 x 14
 y 12
 end
-arch woodfloor
+arch sign_w
+name Trouble with the Lever?
+msg
+If you have trouble with the lever you can go this way.
+endmsg
 x 14
-y 13
+y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 14
 y 13
 end
@@ -1872,10 +2284,46 @@
 x 14
 y 18
 end
-arch evergreen
+arch grass
 x 14
 y 19
 end
+arch grass
+x 14
+y 20
+end
+arch biglake_2_2_3
+x 14
+y 20
+end
+arch grass
+x 14
+y 21
+end
+arch biglake_4
+x 14
+y 21
+end
+arch grass
+x 14
+y 22
+end
+arch biglake_4
+x 14
+y 22
+end
+arch grass
+x 14
+y 23
+end
+arch biglake_3_1
+x 14
+y 23
+end
+arch evergreen
+x 14
+y 24
+end
 arch woodfloor
 x 15
 end
@@ -1898,7 +2346,7 @@
 x 15
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 4
 end
@@ -1906,7 +2354,7 @@
 x 15
 y 5
 end
-arch wall_3_3
+arch wall_4
 x 15
 y 5
 end
@@ -1946,7 +2394,7 @@
 x 15
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 11
 end
@@ -1954,11 +2402,15 @@
 x 15
 y 12
 end
+arch wall_3_2
+x 15
+y 12
+end
 arch woodfloor
 x 15
 y 13
 end
-arch wall_2_2_3
+arch wall_2_2_1
 x 15
 y 13
 end
@@ -1966,33 +2418,27 @@
 x 15
 y 14
 end
-arch wall_2_2_1
-x 15
-y 14
-end
 arch woodfloor2
 x 15
 y 15
 end
-arch button_trigger
+arch sign
+name Levers
+msg
+Some gates and doors are opened by levers. Apply (press space bar) the lever to your south to continue.
+endmsg
 x 15
 y 15
-invisible 1
-connected 2
 end
 arch woodfloor
 x 15
 y 16
 end
-arch wall_2_2_2
-x 15
-y 16
-end
 arch woodfloor
 x 15
 y 17
 end
-arch wall_2_2_4
+arch window_win2
 x 15
 y 17
 end
@@ -2000,10 +2446,42 @@
 x 15
 y 18
 end
-arch evergreen
+arch grass
 x 15
 y 19
 end
+arch grass
+x 15
+y 20
+end
+arch grass
+x 15
+y 21
+end
+arch biglake_2_1_2
+x 15
+y 21
+end
+arch grasspond
+x 15
+y 22
+end
+arch biglake_3_3
+x 15
+y 22
+end
+arch grass
+x 15
+y 23
+end
+arch biglake_3_1
+x 15
+y 23
+end
+arch evergreen
+x 15
+y 24
+end
 arch woodfloor
 x 16
 end
@@ -2023,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
@@ -2043,7 +2523,7 @@
 x 16
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 16
 y 4
 end
@@ -2051,7 +2531,7 @@
 x 16
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 16
 y 5
 end
@@ -2083,7 +2563,7 @@
 x 16
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 16
 y 11
 end
@@ -2091,15 +2571,19 @@
 x 16
 y 12
 end
+arch wall_4
+x 16
+y 12
+end
 arch woodfloor
 x 16
 y 13
 end
-arch woodfloor
+arch wall_3_1
 x 16
-y 14
+y 13
 end
-arch wall_2_1_2
+arch woodfloor
 x 16
 y 14
 end
@@ -2107,34 +2591,61 @@
 x 16
 y 15
 end
-arch igateTrg2
+arch woodfloor
 x 16
-y 15
-connected 2
+y 16
 end
 arch woodfloor
 x 16
-y 16
+y 17
 end
 arch wall_2_1_2
 x 16
-y 16
+y 17
 end
 arch grass
 x 16
-y 17
+y 18
 end
-arch flowers_permanent
+arch grass
 x 16
-y 17
+y 19
 end
 arch grass
 x 16
-y 18
+y 20
+end
+arch bird
+x 16
+y 20
+end
+arch grass
+x 16
+y 21
+end
+arch biglake_2_1_2
+x 16
+y 21
+end
+arch grass
+x 16
+y 22
+end
+arch biglake_3_3
+x 16
+y 22
+end
+arch grass
+x 16
+y 23
+end
+arch biglake_2_2_4
+x 16
+y 23
 end
 arch evergreen
 x 16
-y 19
+y 24
 end
 arch woodfloor
 x 17
@@ -2158,7 +2669,7 @@
 x 17
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 17
 y 4
 end
@@ -2166,7 +2677,7 @@
 x 17
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 17
 y 5
 end
@@ -2206,7 +2717,7 @@
 x 17
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 17
 y 11
 end
@@ -2214,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_2
+arch wall_4
 x 17
 y 13
 end
@@ -2226,7 +2741,7 @@
 x 17
 y 14
 end
-arch wall_2_2_4
+arch wall_2_2_1
 x 17
 y 14
 end
@@ -2244,7 +2759,7 @@
 x 17
 y 16
 end
-arch wall_2_2_3
+arch wall_2_2_2
 x 17
 y 16
 end
@@ -2252,7 +2767,7 @@
 x 17
 y 17
 end
-arch wall_2_2_1
+arch wall_2_2_4
 x 17
 y 17
 end
@@ -2260,10 +2775,42 @@
 x 17
 y 18
 end
-arch evergreen
+arch grass
 x 17
 y 19
 end
+arch grass
+x 17
+y 20
+end
+arch grass
+x 17
+y 21
+end
+arch biglake_2_2_3
+x 17
+y 21
+end
+arch grass
+x 17
+y 22
+end
+arch biglake_2_2_4
+x 17
+y 22
+end
+arch grass
+x 17
+y 23
+end
+arch tree7
+x 17
+y 23
+end
+arch evergreen
+x 17
+y 24
+end
 arch woodfloor
 x 18
 end
@@ -2281,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
@@ -2302,7 +2851,7 @@
 x 18
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 18
 y 4
 end
@@ -2310,7 +2859,7 @@
 x 18
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 18
 y 5
 end
@@ -2350,7 +2899,7 @@
 x 18
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 18
 y 11
 end
@@ -2358,11 +2907,15 @@
 x 18
 y 12
 end
+arch wall_4
+x 18
+y 12
+end
 arch woodfloor
 x 18
 y 13
 end
-arch wall_2_1_2
+arch wall_4
 x 18
 y 13
 end
@@ -2370,19 +2923,32 @@
 x 18
 y 14
 end
+arch wall_3_1
+x 18
+y 14
+end
 arch woodfloor2
 x 18
 y 15
 end
+arch igateTrg2
+x 18
+y 15
+connected 2
+end
 arch woodfloor
 x 18
 y 16
 end
-arch woodfloor
+arch wall_2_1_2
+x 18
+y 16
+end
+arch grass
 x 18
 y 17
 end
-arch wall_2_1_2
+arch flowers_permanent
 x 18
 y 17
 end
@@ -2394,10 +2960,34 @@
 x 18
 y 18
 end
-arch evergreen
+arch grass
 x 18
 y 19
 end
+arch grass
+x 18
+y 20
+end
+arch grass
+x 18
+y 21
+end
+arch tree7
+x 18
+y 21
+end
+arch grass
+x 18
+y 22
+end
+arch grass
+x 18
+y 23
+end
+arch evergreen
+x 18
+y 24
+end
 arch woodfloor
 x 19
 end
@@ -2420,7 +3010,7 @@
 x 19
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 19
 y 4
 end
@@ -2428,7 +3018,7 @@
 x 19
 y 5
 end
-arch wall_2_1_2
+arch wall_3_1
 x 19
 y 5
 end
@@ -2465,7 +3055,7 @@
 x 19
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 19
 y 11
 end
@@ -2473,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_1_2
+arch wall_4
 x 19
 y 13
 end
@@ -2485,30 +3079,33 @@
 x 19
 y 14
 end
+arch wall_2_2_4
+x 19
+y 14
+end
 arch woodfloor2
 x 19
 y 15
 end
-arch sign
-name Automatic Doors
-msg
-Some doors will open when you walk up to them,
-then close after a moment.  Be careful not to
-get crushed by standing in the doorway
-too long!
-endmsg
+arch button_trigger
 x 19
 y 15
+invisible 1
+connected 2
 end
 arch woodfloor
 x 19
 y 16
 end
+arch wall_2_2_3
+x 19
+y 16
+end
 arch woodfloor
 x 19
 y 17
 end
-arch window_win2
+arch wall_2_2_1
 x 19
 y 17
 end
@@ -2516,10 +3113,30 @@
 x 19
 y 18
 end
-arch evergreen
+arch grass
 x 19
 y 19
 end
+arch grass
+x 19
+y 20
+end
+arch grass
+x 19
+y 21
+end
+arch grass
+x 19
+y 22
+end
+arch grass
+x 19
+y 23
+end
+arch evergreen
+x 19
+y 24
+end
 arch woodfloor
 x 20
 end
@@ -2536,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
@@ -2561,7 +3181,7 @@
 x 20
 y 4
 end
-arch wall_2_1_2
+arch wall_3_3
 x 20
 y 4
 end
@@ -2569,7 +3189,7 @@
 x 20
 y 5
 end
-arch wall_2_2_3
+arch wall_4
 x 20
 y 5
 end
@@ -2577,7 +3197,7 @@
 x 20
 y 6
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 6
 end
@@ -2585,7 +3205,7 @@
 x 20
 y 7
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 7
 end
@@ -2593,7 +3213,7 @@
 x 20
 y 8
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 8
 end
@@ -2601,7 +3221,7 @@
 x 20
 y 9
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 9
 end
@@ -2609,7 +3229,7 @@
 x 20
 y 10
 end
-arch wall_2_1_1
+arch wall_3_2
 x 20
 y 10
 end
@@ -2617,7 +3237,7 @@
 x 20
 y 11
 end
-arch wall_2_2_4
+arch wall_4
 x 20
 y 11
 end
@@ -2625,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
@@ -2657,10 +3281,30 @@
 x 20
 y 18
 end
-arch evergreen
+arch grasspond
 x 20
 y 19
 end
+arch grass
+x 20
+y 20
+end
+arch grass
+x 20
+y 21
+end
+arch grass
+x 20
+y 22
+end
+arch grass
+x 20
+y 23
+end
+arch evergreen
+x 20
+y 24
+end
 arch woodfloor
 x 21
 end
@@ -2691,7 +3335,7 @@
 x 21
 y 5
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 5
 end
@@ -2699,7 +3343,7 @@
 x 21
 y 6
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 6
 end
@@ -2707,7 +3351,7 @@
 x 21
 y 7
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 7
 end
@@ -2715,7 +3359,7 @@
 x 21
 y 8
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 8
 end
@@ -2723,7 +3367,7 @@
 x 21
 y 9
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 9
 end
@@ -2731,7 +3375,7 @@
 x 21
 y 10
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 10
 end
@@ -2739,7 +3383,7 @@
 x 21
 y 11
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 11
 end
@@ -2747,7 +3391,7 @@
 x 21
 y 12
 end
-arch wall_2_1_1
+arch wall_3_4
 x 21
 y 12
 end
@@ -2783,10 +3427,30 @@
 x 21
 y 18
 end
-arch evergreen
+arch grass
 x 21
 y 19
 end
+arch grass
+x 21
+y 20
+end
+arch grass
+x 21
+y 21
+end
+arch grass
+x 21
+y 22
+end
+arch grass
+x 21
+y 23
+end
+arch evergreen
+x 21
+y 24
+end
 arch woodfloor
 x 22
 end
@@ -2891,10 +3555,34 @@
 x 22
 y 18
 end
-arch evergreen
+arch grass
 x 22
 y 19
 end
+arch grass
+x 22
+y 20
+end
+arch grasspond
+x 22
+y 21
+end
+arch grass
+x 22
+y 22
+end
+arch grass
+x 22
+y 23
+end
+arch tree7
+x 22
+y 23
+end
+arch evergreen
+x 22
+y 24
+end
 arch woodfloor
 x 23
 end
@@ -2952,7 +3640,8 @@
 
 Be careful not to run into friendly NPCs: dead men tell no tales.
 
-Now go talk to that old man.
+Now go talk to that old man. (Remember: B<left-click> on him while standing
+next to him to start the conversation!)
 
 If you can't find out what to do, take the short cut behind the back of the man.
 endmsg
@@ -3004,6 +3693,19 @@
 x 23
 y 15
 end
+arch sign
+name Automatic Doors
+msg
+Some doors will open when you walk up to them,
+then close after a moment.  
+
+Be careful with some automatic doors, they close when you
+are still in the doorway. So take care not to get crushed by them
+by standing in the doorway too long!
+endmsg
+x 23
+y 15
+end
 arch woodfloor
 x 23
 y 16
@@ -3020,10 +3722,30 @@
 x 23
 y 18
 end
-arch evergreen
+arch grass
 x 23
 y 19
 end
+arch grass
+x 23
+y 20
+end
+arch grass
+x 23
+y 21
+end
+arch grass
+x 23
+y 22
+end
+arch grass
+x 23
+y 23
+end
+arch evergreen
+x 23
+y 24
+end
 arch woodfloor
 x 24
 end
@@ -3111,10 +3833,38 @@
 x 24
 y 18
 end
-arch evergreen
+arch grass
 x 24
 y 19
 end
+arch grass
+x 24
+y 20
+end
+arch tree7
+x 24
+y 20
+end
+arch grass
+x 24
+y 21
+end
+arch bird
+x 24
+y 21
+end
+arch grass
+x 24
+y 22
+end
+arch grass
+x 24
+y 23
+end
+arch evergreen
+x 24
+y 24
+end
 arch woodfloor
 x 25
 end
@@ -3266,10 +4016,30 @@
 x 25
 y 18
 end
-arch evergreen
+arch grass
 x 25
 y 19
 end
+arch grass
+x 25
+y 20
+end
+arch grass
+x 25
+y 21
+end
+arch grass
+x 25
+y 22
+end
+arch grasspond
+x 25
+y 23
+end
+arch evergreen
+x 25
+y 24
+end
 arch evergreen
 x 26
 end
@@ -3361,10 +4131,30 @@
 x 26
 y 18
 end
-arch evergreen
+arch grass
 x 26
 y 19
 end
+arch grass
+x 26
+y 20
+end
+arch grass
+x 26
+y 21
+end
+arch grass
+x 26
+y 22
+end
+arch grass
+x 26
+y 23
+end
+arch evergreen
+x 26
+y 24
+end
 arch evergreen
 x 27
 end
@@ -3472,3 +4262,23 @@
 x 27
 y 19
 end
+arch evergreen
+x 27
+y 20
+end
+arch evergreen
+x 27
+y 21
+end
+arch evergreen
+x 27
+y 22
+end
+arch evergreen
+x 27
+y 23
+end
+arch evergreen
+x 27
+y 24
+end