--- cf.schmorp.de/maps/start/tutorial_part1.map	2007/10/25 11:48:18	1.4
+++ cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/09 01:50:07	1.17
@@ -1,9 +1,10 @@
 arch map
 name Tutorial Part1
-width 26
+width 28
 height 20
 enter_x 8
 enter_y 1
+per_player 1
 end
 arch evergreen
 end
@@ -230,26 +231,14 @@
 x 2
 y 1
 end
-arch grass
-x 2
-y 2
-end
 arch biglake_2_1_1
 x 2
 y 2
 end
-arch grass
-x 2
-y 3
-end
 arch biglake_2_1_1
 x 2
 y 3
 end
-arch grass
-x 2
-y 4
-end
 arch biglake_2_1_1
 x 2
 y 4
@@ -331,7 +320,7 @@
 x 2
 y 19
 end
-arch wall_1_3
+arch wall_2_1_2
 x 2
 y 19
 end
@@ -346,26 +335,14 @@
 x 3
 y 1
 end
-arch grass
-x 3
-y 2
-end
 arch biglake_2_1_1
 x 3
 y 2
 end
-arch grass
-x 3
-y 3
-end
 arch biglake_2_1_1
 x 3
 y 3
 end
-arch grass
-x 3
-y 4
-end
 arch biglake_2_1_1
 x 3
 y 4
@@ -386,6 +363,10 @@
 x 3
 y 6
 end
+arch bird
+x 3
+y 6
+end
 arch woodfloor
 x 3
 y 7
@@ -450,13 +431,13 @@
 name Triggering Buttons with Weights
 msg
 Sometimes large buttons in the floor can
-be activated by a large weight.  Run into this
-boulder (B<Ctrl-Left>) to push it onto the button to your
-west, and see what happens.
+be activated by pushing a large a large weight on them.  Run into this
+boulder (B<Ctrl-UpArrow>) to push it onto the button to the north,
+and see what happens.
 
-Boulders and other "rollable" items like barrels can only be pushed,
+Boulders and other "movable" items like barrels can only be pushed,
 never pulled, so be careful not to push them into corners from where
-you won't be able to move them to their destination.
+you won't be able to move out.
 
 If you are very weak you may have to try a lot of times to move the boulder. Do not give up! Even
 weak characters can push things if they are persistent.
@@ -480,18 +461,6 @@
 x 3
 y 17
 end
-arch sign
-name Triggering Buttons with Weights
-msg
-The door in the south will bring you to the next
-part of this tutorial.
-
-Did you already figure out what the boulder does
-in the north?
-endmsg
-x 3
-y 17
-end
 arch woodfloor
 x 3
 y 18
@@ -500,11 +469,7 @@
 x 3
 y 19
 end
-arch exit
-slaying tutorial_part2
-face oakdoor.x11
-hp 3
-sp 0
+arch wall_1_3
 x 3
 y 19
 end
@@ -600,27 +565,43 @@
 x 4
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 15
 end
-arch woodfloor
+arch sign
+name Triggering Buttons with Weights
+msg
+The portal to the south will bring you to the class
+selection, where you have to choose a class for your
+character.
+
+But did you already figure out what the boulder does
+in the north?
+endmsg
+x 4
+y 15
+end
+arch woodfloor2
 x 4
 y 16
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 17
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 18
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 19
 end
-arch wall_1_4
+arch exit
+slaying tutorial_class
+hp 4
+sp 1
 x 4
 y 19
 end
@@ -647,6 +628,10 @@
 x 5
 y 3
 end
+arch bee
+x 5
+y 3
+end
 arch grasspond
 x 5
 y 4
@@ -704,7 +689,7 @@
 x 5
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 5
 y 15
 end
@@ -735,6 +720,10 @@
 x 6
 y 1
 end
+arch bird
+x 6
+y 1
+end
 arch grasspond
 x 6
 y 2
@@ -804,7 +793,7 @@
 x 6
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 6
 y 15
 end
@@ -846,7 +835,7 @@
 x 7
 y 2
 end
-arch window_win1
+arch wall_2_1_1
 x 7
 y 2
 end
@@ -854,7 +843,7 @@
 x 7
 y 3
 end
-arch window_win1
+arch wall_2_1_1
 x 7
 y 3
 end
@@ -862,7 +851,7 @@
 x 7
 y 4
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 4
 end
@@ -870,7 +859,7 @@
 x 7
 y 5
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 5
 end
@@ -878,7 +867,7 @@
 x 7
 y 6
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 6
 end
@@ -918,7 +907,7 @@
 x 7
 y 11
 end
-arch wall_3_2
+arch wall_2_2_1
 x 7
 y 11
 end
@@ -926,15 +915,11 @@
 x 7
 y 12
 end
-arch wall_3_2
-x 7
-y 12
-end
 arch woodfloor
 x 7
 y 13
 end
-arch wall_2_1_1
+arch wall_2_2_2
 x 7
 y 13
 end
@@ -946,7 +931,7 @@
 x 7
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 7
 y 15
 end
@@ -967,7 +952,7 @@
 x 7
 y 17
 end
-arch wall_2_2_1
+arch wall_2_1_1
 x 7
 y 17
 end
@@ -975,11 +960,15 @@
 x 7
 y 18
 end
+arch wall_2_1_1
+x 7
+y 18
+end
 arch woodfloor
 x 7
 y 19
 end
-arch wall_2_1_2
+arch wall_2_2_4
 x 7
 y 19
 end
@@ -989,7 +978,7 @@
 arch wall_2_1_2
 x 8
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 1
 end
@@ -998,7 +987,7 @@
 x 8
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 2
 end
@@ -1022,15 +1011,13 @@
 x 8
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 3
 end
 arch sign
 name Press space to read me
 msg
-=== Commands ===
-
 There are many commands you can use to
 do everything from movement to attacking
 to casting spells to identifying treasure.  Any
@@ -1038,8 +1025,8 @@
 simply typing it in and pressing B<Space>+B<Return>.
 
 So to move southeast, for example, you could type
-B<<southeast <return> >>. To read this sign, you could type
-B<<apply sign <return> >>. These "long-form" commands are
+B<< southeast <return> >>. To read this sign, you could type
+B<< apply sign <return> >>. These "long-form" commands are
 always available for everything you can do in
 the game.
 
@@ -1048,7 +1035,7 @@
 many commands are bound to keys by default.
 
 You can also enter commands by typing their initials. For example,
-instead of typing B<<southeast <return> >>, you can type B<< se<return> >> (note the lack of the space).
+instead of typing B<< southeast <return> >>, you can type B<< se<return> >> (note the lack of the space).
 Instead of typing B<cast summon pet monster> you can usually type B<cspm> and so on.
 
 You can also create your own keybindings, for example to use spells, items or skills. To do that, you
@@ -1058,39 +1045,37 @@
 x 8
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 4
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 8
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 10
 end
 arch sign
 name Press space to read me
 msg
-=== Movement ===
-
 You can move in any of eight directions: north,
 south, east, west, and the four in between.
 Pressing a movement key once (or executing a
@@ -1107,7 +1092,8 @@
 and all eight directions including diagonals on the numeric keypad. For laptop users
 without numeric keypads you can also use B<Alt>-arrow key to get a diagonal movement.
 
-Now run to the end of this hallway (by pressing and holding B<Ctrl-Right-Arrow>), and read
+Now run to the end of this hallway
+(by pressing and holding B<Ctrl-Right-Arrow>), and read
 the sign there.
 endmsg
 x 8
@@ -1125,11 +1111,11 @@
 x 8
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 8
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 8
 y 13
 end
@@ -1141,7 +1127,7 @@
 x 8
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 15
 end
@@ -1158,23 +1144,15 @@
 x 8
 y 16
 end
-arch woodfloor
-x 8
-y 17
-end
-arch wall_2_1_2
+arch grass
 x 8
 y 17
 end
-arch woodfloor
+arch grass
 x 8
 y 18
 end
-arch woodfloor
-x 8
-y 19
-end
-arch wall_2_1_2
+arch evergreen
 x 8
 y 19
 end
@@ -1256,7 +1234,7 @@
 x 9
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 10
 end
@@ -1272,15 +1250,11 @@
 x 9
 y 12
 end
-arch wall_3_3
-x 9
-y 12
-end
 arch woodfloor
 x 9
 y 13
 end
-arch wall_2_1_1
+arch wall_2_2_3
 x 9
 y 13
 end
@@ -1292,7 +1266,7 @@
 x 9
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 15
 end
@@ -1314,19 +1288,15 @@
 x 9
 y 17
 end
-arch wall_2_2_4
+arch wall_2_2_1
 x 9
 y 17
 end
-arch woodfloor
+arch grass
 x 9
 y 18
 end
-arch woodfloor
-x 9
-y 19
-end
-arch wall_2_1_2
+arch evergreen
 x 9
 y 19
 end
@@ -1384,7 +1354,7 @@
 x 10
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 10
 end
@@ -1400,7 +1370,11 @@
 x 10
 y 12
 end
-arch wall_2_1_2
+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
@@ -1412,7 +1386,7 @@
 x 10
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 15
 end
@@ -1424,15 +1398,15 @@
 x 10
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 10
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 10
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 10
 y 19
 end
@@ -1458,7 +1432,7 @@
 x 11
 y 4
 end
-arch wall_2_1_2
+arch wall_2_2_3
 x 11
 y 4
 end
@@ -1466,7 +1440,7 @@
 x 11
 y 5
 end
-arch wall_2_1_2
+arch wall_2_2_4
 x 11
 y 5
 end
@@ -1478,6 +1452,10 @@
 x 11
 y 7
 end
+arch wall_0
+x 11
+y 7
+end
 arch woodfloor
 x 11
 y 8
@@ -1490,7 +1468,7 @@
 x 11
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 10
 end
@@ -1498,7 +1476,7 @@
 x 11
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 11
 y 11
 end
@@ -1506,7 +1484,7 @@
 x 11
 y 12
 end
-arch wall_2_1_2
+arch wall_2_1_1
 x 11
 y 12
 end
@@ -1514,11 +1492,15 @@
 x 11
 y 13
 end
+arch wall_2_2_1
+x 11
+y 13
+end
 arch woodfloor
 x 11
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 15
 end
@@ -1530,15 +1512,15 @@
 x 11
 y 17
 end
-arch woodfloor
+arch window_win2
 x 11
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 11
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 11
 y 19
 end
@@ -1552,51 +1534,41 @@
 x 12
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 2
 end
 arch sign
 name Food
 msg
-=== Food ===
-
 Eating food is very important. Without food you cannot heal or regenerate magical
-energy. Go north to learn more about food, and cash in some free food
+energy. Go east to learn more about food, and cash in some free food
 at the same time!
 endmsg
 x 12
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 4
 end
-arch wall_2_2_3
-x 12
-y 4
-end
-arch woodfloor
-x 12
-y 5
-end
-arch wall_2_2_4
+arch woodfloor2
 x 12
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 8
 end
@@ -1608,7 +1580,7 @@
 x 12
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 10
 end
@@ -1624,11 +1596,11 @@
 x 12
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 12
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 12
 y 13
 end
@@ -1636,7 +1608,7 @@
 x 12
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 15
 end
@@ -1656,15 +1628,15 @@
 x 12
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 12
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 12
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 12
 y 19
 end
@@ -1678,7 +1650,7 @@
 x 13
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 2
 end
@@ -1690,42 +1662,31 @@
 x 13
 y 4
 end
+arch wall_2_2_2
+x 13
+y 4
+end
 arch woodfloor
 x 13
 y 5
 end
-arch woodfloor
+arch wall_2_2_1
 x 13
-y 6
+y 5
 end
-arch magic_mouth
-msg
-A magic voice says:
-
-Here is a note you can pick up and take with you.  (You may have already picked it up
-automatically if your client is set to do that.  If so, find it in your inventory and read it by
-clicking with the middle mouse button or scroll wheel).  You may wish
-to read it first (press B<space> to apply it), and then pick it up (press the B<comma> key or use the B<take> command).
-Now it will be in your inventory, so you can read it anytime you need to.
-endmsg
+arch woodfloor
 x 13
-y 7
+y 6
 end
 arch woodfloor
 x 13
 y 7
 end
-arch note
-msg
-Hah! Made you look!
-
-You can go to the next sign now :)
-endmsg
+arch wall_0
 x 13
 y 7
-identified 1
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 8
 end
@@ -1737,7 +1698,7 @@
 x 13
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 10
 end
@@ -1753,11 +1714,11 @@
 x 13
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 13
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 13
 y 13
 end
@@ -1765,7 +1726,7 @@
 x 13
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 15
 end
@@ -1777,15 +1738,15 @@
 x 13
 y 17
 end
-arch woodfloor
+arch window_win2
 x 13
-y 18
+y 17
 end
-arch woodfloor
+arch grasspond
 x 13
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 13
 y 19
 end
@@ -1801,7 +1762,7 @@
 end
 arch magic_mouth
 msg
-A message scrawled on the wall says:
+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
@@ -1811,7 +1772,7 @@
 x 14
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 2
 end
@@ -1827,7 +1788,7 @@
 x 14
 y 4
 end
-arch wall_2_2_2
+arch wall_2_1_2
 x 14
 y 4
 end
@@ -1835,7 +1796,7 @@
 x 14
 y 5
 end
-arch wall_2_2_1
+arch wall_2_1_2
 x 14
 y 5
 end
@@ -1847,7 +1808,7 @@
 x 14
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 8
 end
@@ -1859,14 +1820,7 @@
 x 14
 y 9
 end
-arch magic_mouth
-msg
-A sign on the wall says:  Slow Down!!
-endmsg
-x 14
-y 10
-end
-arch woodfloor
+arch woodfloor2
 x 14
 y 10
 end
@@ -1882,11 +1836,11 @@
 x 14
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 14
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 14
 y 13
 end
@@ -1894,7 +1848,7 @@
 x 14
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 15
 end
@@ -1906,15 +1860,15 @@
 x 14
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 14
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 14
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 14
 y 19
 end
@@ -1928,20 +1882,7 @@
 x 15
 y 1
 end
-arch magic_mouth
-msg
-A message scrawled on the wall says:
-
-There are many types of food you can eat.
-Be careful, though: food that you find may be
-poisonous, so to be safe, don't eat food until
-you've identified it.  (More on identifying items
-later.)
-endmsg
-x 15
-y 2
-end
-arch woodfloor
+arch woodfloor2
 x 15
 y 2
 end
@@ -1961,7 +1902,7 @@
 x 15
 y 5
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 5
 end
@@ -1969,11 +1910,19 @@
 x 15
 y 6
 end
+arch wall_2_1_1
+x 15
+y 6
+end
 arch woodfloor
 x 15
 y 7
 end
-arch woodfloor
+arch wall_1_2
+x 15
+y 7
+end
+arch woodfloor2
 x 15
 y 8
 end
@@ -1985,7 +1934,7 @@
 x 15
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 10
 end
@@ -2001,15 +1950,11 @@
 x 15
 y 12
 end
-arch wall_3_3
-x 15
-y 12
-end
 arch woodfloor
 x 15
 y 13
 end
-arch wall_2_2_1
+arch wall_2_2_3
 x 15
 y 13
 end
@@ -2017,25 +1962,25 @@
 x 15
 y 14
 end
-arch button_trigger
+arch wall_2_2_1
 x 15
 y 14
-invisible 1
-connected 2
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 15
 end
-arch wall_2_2_2
+arch button_trigger
 x 15
 y 15
+invisible 1
+connected 2
 end
 arch woodfloor
 x 15
 y 16
 end
-arch wall_3_2
+arch wall_2_2_2
 x 15
 y 16
 end
@@ -2043,23 +1988,15 @@
 x 15
 y 17
 end
-arch wall_2_1_1
+arch wall_2_2_4
 x 15
 y 17
 end
-arch woodfloor
-x 15
-y 18
-end
-arch wall_2_1_1
+arch grasspond
 x 15
 y 18
 end
-arch woodfloor
-x 15
-y 19
-end
-arch wall_2_2_4
+arch evergreen
 x 15
 y 19
 end
@@ -2075,7 +2012,7 @@
 end
 arch magic_mouth
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 There are many types of food you can eat.
 Be careful, though: food that you find may be
@@ -2086,7 +2023,7 @@
 x 16
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 2
 end
@@ -2114,15 +2051,15 @@
 x 16
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 8
 end
@@ -2134,7 +2071,7 @@
 x 16
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 10
 end
@@ -2150,34 +2087,26 @@
 x 16
 y 12
 end
-arch wall_2_1_2
-x 16
-y 12
-end
 arch woodfloor
 x 16
 y 13
 end
-arch wall_2_1_2
-x 16
-y 13
-end
 arch woodfloor
 x 16
 y 14
 end
-arch igateTrg2
+arch wall_2_1_2
 x 16
 y 14
-connected 2
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 15
 end
-arch wall_2_1_2
+arch igateTrg2
 x 16
 y 15
+connected 2
 end
 arch woodfloor
 x 16
@@ -2187,15 +2116,19 @@
 x 16
 y 16
 end
-arch woodfloor
+arch grass
 x 16
 y 17
 end
-arch woodfloor
+arch flowers_permanent
+x 16
+y 17
+end
+arch grass
 x 16
 y 18
 end
-arch woodfloor
+arch evergreen
 x 16
 y 19
 end
@@ -2209,11 +2142,7 @@
 x 17
 y 1
 end
-arch magic_mouth
-x 17
-y 2
-end
-arch woodfloor
+arch woodfloor2
 x 17
 y 2
 end
@@ -2237,7 +2166,7 @@
 x 17
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 6
 end
@@ -2245,19 +2174,27 @@
 x 17
 y 7
 end
+arch wall_2_2_2
+x 17
+y 7
+end
 arch woodfloor
 x 17
 y 8
 end
+arch wall_2_1_1
+x 17
+y 8
+end
 arch woodfloor
 x 17
 y 9
 end
-arch wall_2_1_2
+arch wall_3_1
 x 17
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 10
 end
@@ -2273,15 +2210,11 @@
 x 17
 y 12
 end
-arch wall_3_3
-x 17
-y 12
-end
 arch woodfloor
 x 17
 y 13
 end
-arch wall_2_2_4
+arch wall_2_2_2
 x 17
 y 13
 end
@@ -2289,25 +2222,25 @@
 x 17
 y 14
 end
-arch button_trigger
+arch wall_2_2_4
 x 17
 y 14
-invisible 1
-connected 2
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 15
 end
-arch wall_2_2_3
+arch button_trigger
 x 17
 y 15
+invisible 1
+connected 2
 end
 arch woodfloor
 x 17
 y 16
 end
-arch wall_3_1
+arch wall_2_2_3
 x 17
 y 16
 end
@@ -2315,11 +2248,15 @@
 x 17
 y 17
 end
-arch woodfloor
+arch wall_2_2_1
+x 17
+y 17
+end
+arch grass
 x 17
 y 18
 end
-arch woodfloor
+arch evergreen
 x 17
 y 19
 end
@@ -2335,7 +2272,7 @@
 end
 arch magic_mouth
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 When you kill monsters, sometimes they leave
 body parts behind, and these can be taken and
@@ -2344,7 +2281,7 @@
 x 18
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 2
 end
@@ -2373,7 +2310,7 @@
 x 18
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 6
 end
@@ -2381,19 +2318,27 @@
 x 18
 y 7
 end
+arch wall_2_2_3
+x 18
+y 7
+end
 arch woodfloor
 x 18
 y 8
 end
+arch wall_2_1_1
+x 18
+y 8
+end
 arch woodfloor
 x 18
 y 9
 end
-arch wall_1_3
+arch wall_2_2_4
 x 18
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 10
 end
@@ -2409,11 +2354,11 @@
 x 18
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 18
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 18
 y 13
 end
@@ -2421,7 +2366,7 @@
 x 18
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 15
 end
@@ -2429,19 +2374,23 @@
 x 18
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 18
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 18
 y 17
 end
-arch woodfloor
+arch grass
 x 18
 y 18
 end
-arch woodfloor
+arch flowers_permanent
+x 18
+y 18
+end
+arch evergreen
 x 18
 y 19
 end
@@ -2455,7 +2404,7 @@
 x 19
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 2
 end
@@ -2479,51 +2428,31 @@
 x 19
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 8
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 10
 end
 arch sign
-name Gathering Information
+name Movement 2
 msg
-=== Information ===
-
-There are many sources of information other
-than signs like this one. Did you see the sign
-on the wall as you were running here?
-Sometimes information comes from non-visible
-sources like that, so always keep your eyes
-open and don't miss anything that shows up
-in your B<Messages> window.
-
-Information also comes from books, notes, and
-many other sources. The smallest note can be
-the first clue to a large treasure or heroic quest,
-so always gather as much information as possible.
-Some notes and books you will be able to pick
-up and take with you, while others will be
-fixed where they are, but they all may be
-important to read.
-
-It is possible for your character to be unable to read
-such notes. If that is the case and your INT stat is high enough
-you cna later learn to read by learning the literacy skill.
+Now practice some more movement in the next room
+before you read the next sign.
 endmsg
 x 19
 y 10
@@ -2540,11 +2469,11 @@
 x 19
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 19
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 19
 y 13
 end
@@ -2552,52 +2481,38 @@
 x 19
 y 14
 end
+arch woodfloor2
+x 19
+y 15
+end
 arch sign
-name Traps, and Automatic Doors
+name Automatic Doors
 msg
-By the way, it's a good idea to always check
-for traps before trying to open a door. Do
-this with the command B<ready_skill find traps> (short B<rsft>, by default
-bound to the B<Left-Alt-s> key) and then keep firing into the
-direction where you want to search for traps (by pressing and holding B<Shift> + a direction key, here
-B<Shift-Right-Arrow>).
-
-If you find a trap the server will tell you so and the trap will become visible, you can try to disarm it with
-B<ready_skill disarm traps> (short B<rsdt>, bound to B<Left-Alt-d>) and again firing
-into the direction of the trap you found.
-
-You can only find and disable traps if you have those skills. If you don't, you should
-learn them early.
-
 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
 x 19
-y 14
-end
-arch woodfloor
-x 19
 y 15
 end
 arch woodfloor
 x 19
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 19
-y 16
+y 17
 end
-arch woodfloor
+arch window_win2
 x 19
 y 17
 end
-arch woodfloor
+arch grass
 x 19
 y 18
 end
-arch woodfloor
+arch evergreen
 x 19
 y 19
 end
@@ -2612,16 +2527,8 @@
 y 1
 end
 arch magic_mouth
-x 20
-y 2
-end
-arch woodfloor
-x 20
-y 2
-end
-arch waybread
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 Waybreads are the MRE (Meals-Ready-to-Eat)
 of Deliantra. They weigh very little but pack
@@ -2634,6 +2541,14 @@
 x 20
 y 2
 end
+arch woodfloor2
+x 20
+y 2
+end
+arch waybread
+x 20
+y 2
+end
 arch woodfloor
 x 20
 y 3
@@ -2706,11 +2621,11 @@
 x 20
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 20
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 20
 y 13
 end
@@ -2718,7 +2633,7 @@
 x 20
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 20
 y 15
 end
@@ -2726,19 +2641,19 @@
 x 20
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 20
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 20
 y 17
 end
-arch woodfloor
+arch grass
 x 20
 y 18
 end
-arch woodfloor
+arch evergreen
 x 20
 y 19
 end
@@ -2752,7 +2667,7 @@
 x 21
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 21
 y 2
 end
@@ -2764,7 +2679,7 @@
 x 21
 y 4
 end
-arch wall_3_3
+arch wall_2_2_3
 x 21
 y 4
 end
@@ -2828,7 +2743,7 @@
 x 21
 y 12
 end
-arch wall_2_2_4
+arch wall_2_1_1
 x 21
 y 12
 end
@@ -2836,11 +2751,15 @@
 x 21
 y 13
 end
+arch wall_2_2_4
+x 21
+y 13
+end
 arch woodfloor
 x 21
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 21
 y 15
 end
@@ -2848,19 +2767,19 @@
 x 21
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 21
-y 16
+y 17
 end
-arch woodfloor
+arch window_win2
 x 21
 y 17
 end
-arch woodfloor
+arch grass
 x 21
 y 18
 end
-arch woodfloor
+arch evergreen
 x 21
 y 19
 end
@@ -2874,7 +2793,7 @@
 x 22
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 2
 end
@@ -2886,10 +2805,6 @@
 x 22
 y 4
 end
-arch wall_1_3
-x 22
-y 4
-end
 arch woodfloor
 x 22
 y 5
@@ -2901,6 +2816,23 @@
 arch woodfloor
 x 22
 y 7
+move_block all
+end
+arch sign
+name old man
+msg
+@match gate
+Say the word "open" to get through.  Bye now!
+@match open
+@trigger 6 1
+Here you go, have fun!
+@match *
+Hi there! If you want to go through the gate, just ask me to open it.
+endmsg
+face sage.x11
+x 22
+y 7
+connected 6
 end
 arch woodfloor
 x 22
@@ -2910,6 +2842,11 @@
 x 22
 y 9
 end
+arch grate_closed_1
+x 22
+y 9
+connected 6
+end
 arch woodfloor
 x 22
 y 10
@@ -2930,7 +2867,7 @@
 x 22
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 15
 end
@@ -2938,19 +2875,19 @@
 x 22
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 22
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 22
 y 17
 end
-arch woodfloor
+arch grass
 x 22
 y 18
 end
-arch woodfloor
+arch evergreen
 x 22
 y 19
 end
@@ -2964,84 +2901,102 @@
 x 23
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 2
 end
-arch sign
-name Bashing Doors
-msg
-=== Doors ===
-
-There are many kinds of doors in Deliantra.
-Some doors will open for you, so you can walk
-right through. Ordinary locked doors can be
-bashed open by attacking them or using
-lockpicks. Stronger locked doors may require
-a certain key, or open when you speak a magic
-word or activate a certain trigger somewhere.
-
-To get through this first door, run into it until
-you break through. If you are too weak it might take a long time.
-Either be persistent or create a new character with a higher Strength stat.
-endmsg
-x 23
-y 2
-end
-arch woodfloor
+arch woodfloor2
 x 23
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 4
 end
-arch door_2
-hp 4
+arch woodfloor2
 x 23
-y 4
+y 5
 end
-arch woodfloor
+arch sign
+name Talking to NPCs
+msg
+There are two different types of "people" in the game: PCs (player characters, i.e. other players)
+and NPCs (non-player-characters, your typical dumb computer-automated pseudo persons :)
+
+To talk to other players, for example to get help, you can use the B<chat> command, whose text
+is displayed in the B<Chat> tab in the client. All players currently logged in can see that.
+You can simply type B<c some message>+<return> to chat with others without activating the Chat tab.
+There is also the B<shout> command (short "sh") for use in emergencies, and B<say> (short "s")
+which all players on a map and all NPCs near you can hear.
+
+You can also get information from non-player characters (NPCs) in the game by talking to them.
+NPCs that can talk to you have a little speech bubble sign in the upper left corner of their map space.
+
+To talk to the man at the end of this hallway when you're finished reading this,
+walk up next to him and left-click on him with your mouse.
+
+Clicking on NPCs lets you use a dialog window to communicate with the NPC. The say
+command is more tedious, but works when you can't see the NPC, or you need to say a password.
+
+Many NPC have useful information, but they will only tell you about it if you ask the
+right questions. If the NPC talks to you, look for words in his reply
+that might be important (often they are underlined), and ask about them.
+For example, if he says, "Hello, do you have any food?" ask him about food,
+and he may say something else in response to that.
+Saying words like quest, key, treasure, and other things you're interested in may
+start up very interesting conversations!
+
+Be careful not to run into friendly NPCs: dead men tell no tales.
+
+Now go talk to that old man.
+
+If you can't find out what to do, take the short cut behind the back of the man.
+endmsg
 x 23
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 8
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 9
 end
-arch woodfloor
+arch grate_closed_1
+x 23
+y 9
+connected 6
+end
+arch woodfloor2
 x 23
 y 10
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 11
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 12
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 15
 end
@@ -3049,19 +3004,19 @@
 x 23
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 23
-y 16
+y 17
 end
-arch woodfloor
+arch window_win2
 x 23
 y 17
 end
-arch woodfloor
+arch grasspond
 x 23
 y 18
 end
-arch woodfloor
+arch evergreen
 x 23
 y 19
 end
@@ -3087,10 +3042,6 @@
 x 24
 y 4
 end
-arch wall_1_4
-x 24
-y 4
-end
 arch woodfloor
 x 24
 y 5
@@ -3111,6 +3062,11 @@
 x 24
 y 9
 end
+arch grate_closed_1
+x 24
+y 9
+connected 6
+end
 arch woodfloor
 x 24
 y 10
@@ -3139,19 +3095,19 @@
 x 24
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 24
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 24
 y 17
 end
-arch woodfloor
+arch grass
 x 24
 y 18
 end
-arch woodfloor
+arch evergreen
 x 24
 y 19
 end
@@ -3173,7 +3129,7 @@
 x 25
 y 2
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 2
 end
@@ -3189,7 +3145,7 @@
 x 25
 y 4
 end
-arch wall_3_4
+arch wall_2_1_1
 x 25
 y 4
 end
@@ -3197,7 +3153,7 @@
 x 25
 y 5
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 5
 end
@@ -3205,7 +3161,7 @@
 x 25
 y 6
 end
-arch wall_2_1_1
+arch wall_2_2_1
 x 25
 y 6
 end
@@ -3213,15 +3169,11 @@
 x 25
 y 7
 end
-arch wall_2_1_1
-x 25
-y 7
-end
 arch woodfloor
 x 25
 y 8
 end
-arch wall_2_1_1
+arch wall_1_1
 x 25
 y 8
 end
@@ -3237,7 +3189,7 @@
 x 25
 y 10
 end
-arch wall_2_1_1
+arch wall_1_2
 x 25
 y 10
 end
@@ -3245,15 +3197,11 @@
 x 25
 y 11
 end
-arch wall_2_1_1
-x 25
-y 11
-end
 arch woodfloor
 x 25
 y 12
 end
-arch wall_2_1_1
+arch wall_2_2_2
 x 25
 y 12
 end
@@ -3269,7 +3217,7 @@
 x 25
 y 14
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 14
 end
@@ -3285,7 +3233,7 @@
 x 25
 y 16
 end
-arch wall_2_2_4
+arch wall_2_1_1
 x 25
 y 16
 end
@@ -3293,11 +3241,217 @@
 x 25
 y 17
 end
-arch woodfloor
+arch wall_2_2_4
+x 25
+y 17
+end
+arch grass
 x 25
 y 18
 end
-arch woodfloor
+arch evergreen
 x 25
 y 19
 end
+arch evergreen
+x 26
+end
+arch grass
+x 26
+y 1
+end
+arch grass
+x 26
+y 2
+end
+arch grasspond
+x 26
+y 3
+end
+arch grass
+x 26
+y 4
+end
+arch grass
+x 26
+y 5
+end
+arch woodfloor
+x 26
+y 6
+end
+arch wall_2_1_2
+x 26
+y 6
+end
+arch woodfloor
+x 26
+y 7
+end
+arch woodfloor
+x 26
+y 8
+end
+arch woodfloor
+x 26
+y 9
+end
+arch woodfloor
+x 26
+y 10
+end
+arch woodfloor
+x 26
+y 11
+end
+arch woodfloor
+x 26
+y 12
+end
+arch wall_2_1_2
+x 26
+y 12
+end
+arch grass
+x 26
+y 13
+end
+arch flowers_permanent
+x 26
+y 13
+end
+arch grass
+x 26
+y 14
+end
+arch grass
+x 26
+y 15
+end
+arch grass
+x 26
+y 16
+end
+arch grass
+x 26
+y 17
+end
+arch bird
+x 26
+y 17
+end
+arch grass
+x 26
+y 18
+end
+arch evergreen
+x 26
+y 19
+end
+arch evergreen
+x 27
+end
+arch evergreen
+x 27
+y 1
+end
+arch evergreen
+x 27
+y 2
+end
+arch evergreen
+x 27
+y 3
+end
+arch evergreen
+x 27
+y 4
+end
+arch evergreen
+x 27
+y 5
+end
+arch woodfloor
+x 27
+y 6
+end
+arch wall_2_2_3
+x 27
+y 6
+end
+arch woodfloor
+x 27
+y 7
+end
+arch wall_2_1_1
+x 27
+y 7
+end
+arch woodfloor
+x 27
+y 8
+end
+arch wall_2_1_1
+x 27
+y 8
+end
+arch woodfloor
+x 27
+y 9
+end
+arch wall_2_1_1
+x 27
+y 9
+end
+arch woodfloor
+x 27
+y 10
+end
+arch wall_2_1_1
+x 27
+y 10
+end
+arch woodfloor
+x 27
+y 11
+end
+arch wall_2_1_1
+x 27
+y 11
+end
+arch woodfloor
+x 27
+y 12
+end
+arch wall_2_2_4
+x 27
+y 12
+end
+arch evergreen
+x 27
+y 13
+end
+arch evergreen
+x 27
+y 14
+end
+arch evergreen
+x 27
+y 15
+end
+arch evergreen
+x 27
+y 16
+end
+arch evergreen
+x 27
+y 17
+end
+arch evergreen
+x 27
+y 18
+end
+arch evergreen
+x 27
+y 19
+end