--- cf.schmorp.de/maps/start/tutorial_part1.map	2007/10/23 10:33:47	1.3
+++ cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/09 02:10:21	1.19
@@ -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
@@ -567,6 +532,10 @@
 x 4
 y 8
 end
+arch ruby
+x 4
+y 8
+end
 arch woodfloor
 x 4
 y 9
@@ -596,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
@@ -643,6 +628,10 @@
 x 5
 y 3
 end
+arch bee
+x 5
+y 3
+end
 arch grasspond
 x 5
 y 4
@@ -700,7 +689,7 @@
 x 5
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 5
 y 15
 end
@@ -731,6 +720,10 @@
 x 6
 y 1
 end
+arch bird
+x 6
+y 1
+end
 arch grasspond
 x 6
 y 2
@@ -800,7 +793,7 @@
 x 6
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 6
 y 15
 end
@@ -842,7 +835,7 @@
 x 7
 y 2
 end
-arch window_win1
+arch wall_2_1_1
 x 7
 y 2
 end
@@ -850,7 +843,7 @@
 x 7
 y 3
 end
-arch window_win1
+arch wall_2_1_1
 x 7
 y 3
 end
@@ -858,7 +851,7 @@
 x 7
 y 4
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 4
 end
@@ -866,7 +859,7 @@
 x 7
 y 5
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 5
 end
@@ -874,7 +867,7 @@
 x 7
 y 6
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 6
 end
@@ -914,7 +907,7 @@
 x 7
 y 11
 end
-arch wall_3_2
+arch wall_2_2_1
 x 7
 y 11
 end
@@ -922,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
@@ -942,7 +931,7 @@
 x 7
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 7
 y 15
 end
@@ -963,7 +952,7 @@
 x 7
 y 17
 end
-arch wall_2_2_1
+arch wall_2_1_1
 x 7
 y 17
 end
@@ -971,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
@@ -985,7 +978,7 @@
 arch wall_2_1_2
 x 8
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 1
 end
@@ -994,14 +987,14 @@
 x 8
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 2
 end
 arch sign
 name Press space bar to read me
 msg
-Welcome to Deliantra!
+T<Welcome to Deliantra!>
 
 You are now in the beginner's area, which will
 teach you the fundamentals of playing Deliantra,
@@ -1018,14 +1011,14 @@
 x 8
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 3
 end
 arch sign
 name Press space to read me
 msg
-=== Commands ===
+T<Basic Commands>
 
 There are many commands you can use to
 do everything from movement to attacking
@@ -1034,8 +1027,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.
 
@@ -1044,7 +1037,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
@@ -1054,38 +1047,38 @@
 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 ===
+T<Movement>
 
 You can move in any of eight directions: north,
 south, east, west, and the four in between.
@@ -1103,7 +1096,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
@@ -1121,11 +1115,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
@@ -1137,7 +1131,7 @@
 x 8
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 15
 end
@@ -1154,23 +1148,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
@@ -1252,7 +1238,7 @@
 x 9
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 10
 end
@@ -1268,15 +1254,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
@@ -1288,7 +1270,7 @@
 x 9
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 15
 end
@@ -1310,19 +1292,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
@@ -1380,7 +1358,7 @@
 x 10
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 10
 end
@@ -1396,7 +1374,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
@@ -1408,7 +1390,7 @@
 x 10
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 15
 end
@@ -1420,15 +1402,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
@@ -1454,7 +1436,7 @@
 x 11
 y 4
 end
-arch wall_2_1_2
+arch wall_2_2_3
 x 11
 y 4
 end
@@ -1462,7 +1444,7 @@
 x 11
 y 5
 end
-arch wall_2_1_2
+arch wall_2_2_4
 x 11
 y 5
 end
@@ -1474,6 +1456,10 @@
 x 11
 y 7
 end
+arch wall_0
+x 11
+y 7
+end
 arch woodfloor
 x 11
 y 8
@@ -1486,7 +1472,7 @@
 x 11
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 10
 end
@@ -1494,7 +1480,7 @@
 x 11
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 11
 y 11
 end
@@ -1502,7 +1488,7 @@
 x 11
 y 12
 end
-arch wall_2_1_2
+arch wall_2_1_1
 x 11
 y 12
 end
@@ -1510,11 +1496,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
@@ -1526,15 +1516,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
@@ -1548,51 +1538,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
-x 12
-y 4
-end
-arch wall_2_2_3
+arch woodfloor2
 x 12
 y 4
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 5
 end
-arch wall_2_2_4
-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
@@ -1604,7 +1584,7 @@
 x 12
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 10
 end
@@ -1620,11 +1600,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
@@ -1632,7 +1612,7 @@
 x 12
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 15
 end
@@ -1652,15 +1632,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
@@ -1674,7 +1654,7 @@
 x 13
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 2
 end
@@ -1686,42 +1666,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
@@ -1733,7 +1702,7 @@
 x 13
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 10
 end
@@ -1749,11 +1718,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
@@ -1761,7 +1730,7 @@
 x 13
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 15
 end
@@ -1773,15 +1742,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
@@ -1797,7 +1766,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
@@ -1807,7 +1776,7 @@
 x 14
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 2
 end
@@ -1823,7 +1792,7 @@
 x 14
 y 4
 end
-arch wall_2_2_2
+arch wall_2_1_2
 x 14
 y 4
 end
@@ -1831,7 +1800,7 @@
 x 14
 y 5
 end
-arch wall_2_2_1
+arch wall_2_1_2
 x 14
 y 5
 end
@@ -1843,7 +1812,7 @@
 x 14
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 8
 end
@@ -1855,14 +1824,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
@@ -1878,11 +1840,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
@@ -1890,7 +1852,7 @@
 x 14
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 15
 end
@@ -1902,15 +1864,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
@@ -1924,20 +1886,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
@@ -1957,7 +1906,7 @@
 x 15
 y 5
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 5
 end
@@ -1965,11 +1914,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
@@ -1981,7 +1938,7 @@
 x 15
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 10
 end
@@ -1997,15 +1954,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_1_1
+arch wall_2_2_3
 x 15
 y 13
 end
@@ -2017,7 +1970,7 @@
 x 15
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 15
 end
@@ -2039,23 +1992,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
@@ -2071,7 +2016,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
@@ -2082,7 +2027,7 @@
 x 16
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 2
 end
@@ -2110,15 +2055,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
@@ -2130,7 +2075,7 @@
 x 16
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 10
 end
@@ -2146,10 +2091,6 @@
 x 16
 y 12
 end
-arch wall_2_1_2
-x 16
-y 12
-end
 arch woodfloor
 x 16
 y 13
@@ -2162,7 +2103,7 @@
 x 16
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 15
 end
@@ -2179,15 +2120,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
@@ -2201,11 +2146,7 @@
 x 17
 y 1
 end
-arch magic_mouth
-x 17
-y 2
-end
-arch woodfloor
+arch woodfloor2
 x 17
 y 2
 end
@@ -2229,7 +2170,7 @@
 x 17
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 6
 end
@@ -2237,19 +2178,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
@@ -2265,15 +2214,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_1_1
+arch wall_2_2_2
 x 17
 y 13
 end
@@ -2285,7 +2230,7 @@
 x 17
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 15
 end
@@ -2307,23 +2252,15 @@
 x 17
 y 17
 end
-arch wall_2_1_1
+arch wall_2_2_1
 x 17
 y 17
 end
-arch woodfloor
-x 17
-y 18
-end
-arch wall_2_1_1
+arch grass
 x 17
 y 18
 end
-arch woodfloor
-x 17
-y 19
-end
-arch wall_2_2_1
+arch evergreen
 x 17
 y 19
 end
@@ -2339,7 +2276,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
@@ -2348,7 +2285,7 @@
 x 18
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 2
 end
@@ -2377,7 +2314,7 @@
 x 18
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 6
 end
@@ -2385,19 +2322,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
@@ -2413,11 +2358,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
@@ -2425,7 +2370,7 @@
 x 18
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 15
 end
@@ -2437,15 +2382,19 @@
 x 18
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
+x 18
+y 17
+end
+arch grass
 x 18
 y 18
 end
-arch woodfloor
+arch flowers_permanent
 x 18
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 18
 y 19
 end
@@ -2459,7 +2408,7 @@
 x 19
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 2
 end
@@ -2483,51 +2432,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
@@ -2544,11 +2473,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
@@ -2556,27 +2485,13 @@
 x 19
 y 14
 end
-arch woodfloor
+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
@@ -2593,15 +2508,15 @@
 x 19
 y 17
 end
-arch woodfloor
+arch window_win2
 x 19
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 19
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 19
 y 19
 end
@@ -2616,16 +2531,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
@@ -2638,6 +2545,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
@@ -2710,11 +2625,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
@@ -2722,7 +2637,7 @@
 x 20
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 20
 y 15
 end
@@ -2734,15 +2649,15 @@
 x 20
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 20
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 20
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 20
 y 19
 end
@@ -2756,7 +2671,7 @@
 x 21
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 21
 y 2
 end
@@ -2768,7 +2683,7 @@
 x 21
 y 4
 end
-arch wall_3_3
+arch wall_2_2_3
 x 21
 y 4
 end
@@ -2832,7 +2747,7 @@
 x 21
 y 12
 end
-arch wall_3_4
+arch wall_2_1_1
 x 21
 y 12
 end
@@ -2840,7 +2755,7 @@
 x 21
 y 13
 end
-arch wall_2_1_1
+arch wall_2_2_4
 x 21
 y 13
 end
@@ -2848,11 +2763,7 @@
 x 21
 y 14
 end
-arch wall_1_2
-x 21
-y 14
-end
-arch woodfloor
+arch woodfloor2
 x 21
 y 15
 end
@@ -2860,31 +2771,19 @@
 x 21
 y 16
 end
-arch wall_1_1
-x 21
-y 16
-end
 arch woodfloor
 x 21
 y 17
 end
-arch wall_2_1_1
+arch window_win2
 x 21
 y 17
 end
-arch woodfloor
-x 21
-y 18
-end
-arch wall_2_1_1
+arch grass
 x 21
 y 18
 end
-arch woodfloor
-x 21
-y 19
-end
-arch wall_3_1
+arch evergreen
 x 21
 y 19
 end
@@ -2898,7 +2797,7 @@
 x 22
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 2
 end
@@ -2910,10 +2809,6 @@
 x 22
 y 4
 end
-arch wall_1_3
-x 22
-y 4
-end
 arch woodfloor
 x 22
 y 5
@@ -2925,6 +2820,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
@@ -2934,6 +2846,11 @@
 x 22
 y 9
 end
+arch grate_closed_1
+x 22
+y 9
+connected 6
+end
 arch woodfloor
 x 22
 y 10
@@ -2954,7 +2871,7 @@
 x 22
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 15
 end
@@ -2966,15 +2883,15 @@
 x 22
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 22
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 22
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 22
 y 19
 end
@@ -2988,100 +2905,102 @@
 x 23
 y 1
 end
-arch woodfloor
-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
+arch woodfloor2
 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
-x 23
-y 15
-end
-arch sign
-name Traps, and Automatic Doors
-msg
-After you have learned now the very basics
-of finding your way through the world of Deliantra
-you can walk through the vortex in the south
-to be teleported to the "Beginners House" in Scorn,
-one of the main cities in Deliantra.
-
-You can always come back here later and finish
-the tutorial and learn more. It's recommended
-to finish this tutorial if you are new to this game.
-endmsg
+arch woodfloor2
 x 23
 y 15
 end
@@ -3093,26 +3012,15 @@
 x 23
 y 17
 end
-arch exit
-slaying /scorn/misc/beginners
-msg
-Good luck!
-endmsg
-hp 15
-sp 28
+arch window_win2
 x 23
 y 17
-damned 1
 end
-arch woodfloor
+arch grasspond
 x 23
 y 18
 end
-arch woodfloor
-x 23
-y 19
-end
-arch wall_2_1_2
+arch evergreen
 x 23
 y 19
 end
@@ -3138,10 +3046,6 @@
 x 24
 y 4
 end
-arch wall_1_4
-x 24
-y 4
-end
 arch woodfloor
 x 24
 y 5
@@ -3162,6 +3066,11 @@
 x 24
 y 9
 end
+arch grate_closed_1
+x 24
+y 9
+connected 6
+end
 arch woodfloor
 x 24
 y 10
@@ -3194,15 +3103,15 @@
 x 24
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 24
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 24
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 24
 y 19
 end
@@ -3224,7 +3133,7 @@
 x 25
 y 2
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 2
 end
@@ -3240,7 +3149,7 @@
 x 25
 y 4
 end
-arch wall_3_4
+arch wall_2_1_1
 x 25
 y 4
 end
@@ -3248,7 +3157,7 @@
 x 25
 y 5
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 5
 end
@@ -3256,7 +3165,7 @@
 x 25
 y 6
 end
-arch wall_2_1_1
+arch wall_2_2_1
 x 25
 y 6
 end
@@ -3264,7 +3173,16 @@
 x 25
 y 7
 end
-arch wall_2_1_1
+arch sign_e
+name This way if you are stuck!
+msg
+If you can't get the old man to open the
+gates, you might want to ask other players
+via the 'Chat' tab how to talk to NPCs.
+
+Or maybe you can find a hint about that
+on the previous sign.
+endmsg
 x 25
 y 7
 end
@@ -3272,7 +3190,7 @@
 x 25
 y 8
 end
-arch wall_2_1_1
+arch wall_1_1
 x 25
 y 8
 end
@@ -3288,7 +3206,7 @@
 x 25
 y 10
 end
-arch wall_2_1_1
+arch wall_1_2
 x 25
 y 10
 end
@@ -3296,15 +3214,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
@@ -3320,7 +3234,7 @@
 x 25
 y 14
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 14
 end
@@ -3344,23 +3258,217 @@
 x 25
 y 17
 end
-arch wall_2_1_1
+arch wall_2_2_4
 x 25
 y 17
 end
-arch woodfloor
+arch grass
 x 25
 y 18
 end
-arch wall_2_1_1
+arch evergreen
 x 25
-y 18
+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 25
+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 25
+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