--- cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/08 21:14:20	1.16
+++ cf.schmorp.de/maps/start/tutorial_part1.map	2008/12/09 01:50:07	1.17
@@ -572,10 +572,11 @@
 arch sign
 name Triggering Buttons with Weights
 msg
-The portal to the south will bring you to the next
-part of this tutorial.
+The portal to the south will bring you to the class
+selection, where you have to choose a class for your
+character.
 
-Did you already figure out what the boulder does
+But did you already figure out what the boulder does
 in the north?
 endmsg
 x 4
@@ -1017,8 +1018,6 @@
 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
@@ -1077,8 +1076,6 @@
 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
@@ -1095,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
@@ -1454,6 +1452,10 @@
 x 11
 y 7
 end
+arch wall_0
+x 11
+y 7
+end
 arch woodfloor
 x 11
 y 8
@@ -1539,10 +1541,8 @@
 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
@@ -1564,34 +1564,11 @@
 x 12
 y 6
 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
-x 12
-y 7
-end
 arch woodfloor2
 x 12
 y 7
 end
-arch note
-msg
-Hah! Made you look!
-
-You can go to the next sign now :)
-endmsg
-x 12
-y 7
-identified 1
-end
-arch woodfloor
+arch woodfloor2
 x 12
 y 8
 end
@@ -1701,11 +1678,15 @@
 x 13
 y 6
 end
-arch woodfloor2
+arch woodfloor
 x 13
 y 7
 end
-arch woodfloor
+arch wall_0
+x 13
+y 7
+end
+arch woodfloor2
 x 13
 y 8
 end
@@ -1823,11 +1804,11 @@
 x 14
 y 6
 end
-arch woodfloor2
+arch woodfloor
 x 14
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 8
 end
@@ -1839,13 +1820,6 @@
 x 14
 y 9
 end
-arch magic_mouth
-msg
-A sign on the wall says:  Slow Down!!
-endmsg
-x 14
-y 10
-end
 arch woodfloor2
 x 14
 y 10
@@ -1928,7 +1902,7 @@
 x 15
 y 5
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 5
 end
@@ -1936,12 +1910,20 @@
 x 15
 y 6
 end
-arch woodfloor2
+arch wall_2_1_1
 x 15
-y 7
+y 6
 end
 arch woodfloor
 x 15
+y 7
+end
+arch wall_1_2
+x 15
+y 7
+end
+arch woodfloor2
+x 15
 y 8
 end
 arch woodfloor
@@ -2069,7 +2051,7 @@
 x 16
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 6
 end
@@ -2077,7 +2059,7 @@
 x 16
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 8
 end
@@ -2184,11 +2166,15 @@
 x 17
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 6
 end
-arch woodfloor2
+arch woodfloor
+x 17
+y 7
+end
+arch wall_2_2_2
 x 17
 y 7
 end
@@ -2196,11 +2182,15 @@
 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
@@ -2320,11 +2310,15 @@
 x 18
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 6
 end
-arch woodfloor2
+arch woodfloor
+x 18
+y 7
+end
+arch wall_2_2_3
 x 18
 y 7
 end
@@ -2332,11 +2326,15 @@
 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
@@ -2430,7 +2428,7 @@
 x 19
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 6
 end
@@ -2451,30 +2449,10 @@
 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
@@ -2508,22 +2486,8 @@
 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
@@ -2715,7 +2679,7 @@
 x 21
 y 4
 end
-arch wall_3_3
+arch wall_2_2_3
 x 21
 y 4
 end
@@ -2841,10 +2805,6 @@
 x 22
 y 4
 end
-arch wall_1_3
-x 22
-y 4
-end
 arch woodfloor
 x 22
 y 5
@@ -2856,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
@@ -2865,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
@@ -2923,26 +2905,6 @@
 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 woodfloor2
 x 23
 y 3
@@ -2951,26 +2913,50 @@
 x 23
 y 4
 end
-arch door_2
-hp 4
-x 23
-y 4
-randomitems 
-end
 arch woodfloor2
 x 23
 y 5
 end
-arch woodfloor2
-x 23
-y 6
-end
 arch sign
-name Congrats!
+name Talking to NPCs
 msg
-Doors are stubborn, but at least they do not hit back...
+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 woodfloor2
+x 23
 y 6
 end
 arch woodfloor2
@@ -2985,6 +2971,11 @@
 x 23
 y 9
 end
+arch grate_closed_1
+x 23
+y 9
+connected 6
+end
 arch woodfloor2
 x 23
 y 10
@@ -3051,10 +3042,6 @@
 x 24
 y 4
 end
-arch wall_1_4
-x 24
-y 4
-end
 arch woodfloor
 x 24
 y 5
@@ -3075,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
@@ -3129,7 +3121,7 @@
 x 25
 y 1
 end
-arch window_win1
+arch wall_2_1_1
 x 25
 y 1
 end
@@ -3137,7 +3129,7 @@
 x 25
 y 2
 end
-arch wall_2_2_1
+arch window_win1
 x 25
 y 2
 end
@@ -3145,11 +3137,7 @@
 x 25
 y 3
 end
-arch sign_e
-name Path of the Weak
-msg
-Weaklings go this way. Don't give up, try to bash the door first! Give it your best bang!
-endmsg
+arch wall_2_1_1
 x 25
 y 3
 end
@@ -3157,7 +3145,7 @@
 x 25
 y 4
 end
-arch wall_2_2_3
+arch wall_2_1_1
 x 25
 y 4
 end
@@ -3165,7 +3153,7 @@
 x 25
 y 5
 end
-arch wall_1_2
+arch window_win1
 x 25
 y 5
 end
@@ -3173,11 +3161,11 @@
 x 25
 y 6
 end
-arch woodfloor
+arch wall_2_2_1
 x 25
-y 7
+y 6
 end
-arch wall_2_2_2
+arch woodfloor
 x 25
 y 7
 end
@@ -3185,7 +3173,7 @@
 x 25
 y 8
 end
-arch window_win1
+arch wall_1_1
 x 25
 y 8
 end
@@ -3201,7 +3189,7 @@
 x 25
 y 10
 end
-arch wall_2_1_1
+arch wall_1_2
 x 25
 y 10
 end
@@ -3209,15 +3197,11 @@
 x 25
 y 11
 end
-arch window_win1
-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
@@ -3276,23 +3260,19 @@
 x 26
 y 1
 end
-arch woodfloor
-x 26
-y 2
-end
-arch window_win2
+arch grass
 x 26
 y 2
 end
-arch woodfloor
+arch grasspond
 x 26
 y 3
 end
-arch woodfloor
+arch grass
 x 26
 y 4
 end
-arch woodfloor
+arch grass
 x 26
 y 5
 end
@@ -3300,31 +3280,35 @@
 x 26
 y 6
 end
-arch woodfloor
+arch wall_2_1_2
 x 26
-y 7
+y 6
 end
-arch window_win2
+arch woodfloor
 x 26
 y 7
 end
-arch grass
+arch woodfloor
 x 26
 y 8
 end
-arch grass
+arch woodfloor
 x 26
 y 9
 end
-arch grasspond
+arch woodfloor
 x 26
 y 10
 end
-arch grass
+arch woodfloor
 x 26
 y 11
 end
-arch grass
+arch woodfloor
+x 26
+y 12
+end
+arch wall_2_1_2
 x 26
 y 12
 end
@@ -3371,71 +3355,75 @@
 x 27
 y 1
 end
-arch woodfloor
+arch evergreen
 x 27
 y 2
 end
-arch wall_2_2_3
+arch evergreen
 x 27
-y 2
+y 3
 end
-arch woodfloor
+arch evergreen
 x 27
-y 3
+y 4
 end
-arch wall_2_1_1
+arch evergreen
 x 27
-y 3
+y 5
 end
 arch woodfloor
 x 27
-y 4
+y 6
 end
-arch wall_2_1_1
+arch wall_2_2_3
 x 27
-y 4
+y 6
 end
 arch woodfloor
 x 27
-y 5
+y 7
 end
 arch wall_2_1_1
 x 27
-y 5
+y 7
 end
 arch woodfloor
 x 27
-y 6
+y 8
 end
 arch wall_2_1_1
 x 27
-y 6
+y 8
 end
 arch woodfloor
 x 27
-y 7
+y 9
 end
-arch wall_2_2_4
+arch wall_2_1_1
 x 27
-y 7
+y 9
 end
-arch evergreen
+arch woodfloor
 x 27
-y 8
+y 10
 end
-arch evergreen
+arch wall_2_1_1
 x 27
-y 9
+y 10
 end
-arch evergreen
+arch woodfloor
 x 27
-y 10
+y 11
 end
-arch evergreen
+arch wall_2_1_1
 x 27
 y 11
 end
-arch evergreen
+arch woodfloor
+x 27
+y 12
+end
+arch wall_2_2_4
 x 27
 y 12
 end