--- deliantra/maps/start/tutorial.map	2007/06/07 16:01:27	1.2
+++ deliantra/maps/start/tutorial.map	2007/07/14 13:31:16	1.11
@@ -1,7 +1,7 @@
 arch map
-name Tutorial 1
+name Tutorial
 difficulty 1
-region start
+region creation
 width 24
 height 16
 enter_x 11
@@ -13,10 +13,8 @@
 
 This map is intended for use as a tutorial for
 complete newbies, to teach them some of the
-basic concepts of Crossfire.  Players should
-enter at x-11, y-1.
+basic concepts of Crossfire.
 endmsg
-unique 1
 per_player 1
 end
 arch woodfloor
@@ -463,7 +461,16 @@
 x 3
 y 13
 end
-arch woodfloor
+arch magic_mouth
+msg
+What is the password? (Use the say command and say it)
+
+(Do you still have the note you got back at the beginning of this trip?
+Apply it and see what it says, if you don't remember.)
+
+If you get stuck here and need help, try to talk to other players using the I<chat> command. To do
+so, enter "c help me, I am stuck in the tutorial" or something to that extent.
+endmsg
 x 3
 y 14
 end
@@ -476,12 +483,7 @@
 y 14
 connected 9
 end
-arch magic_mouth
-msg
-What is the password? (Use the say command and say it)
-
-(Do you still have the note you got back at the beginning of this trip? Apply it and see what it says, if you don't remember.)
-endmsg
+arch woodfloor
 x 3
 y 14
 end
@@ -637,10 +639,23 @@
 x 5
 y 1
 end
+arch check_floor
+race mouse
+x 5
+y 2
+last_sp 0
+move_block all
+end
 arch woodfloor
 x 5
 y 2
 end
+arch mat
+name mouse barrier
+name_pl 
+x 5
+y 2
+end
 arch woodfloor
 x 5
 y 3
@@ -695,10 +710,23 @@
 x 5
 y 7
 end
+arch check_floor
+race mouse
+x 5
+y 8
+last_sp 0
+move_block all
+end
 arch woodfloor
 x 5
 y 8
 end
+arch mat
+name mouse barrier
+name_pl 
+x 5
+y 8
+end
 arch woodfloor
 x 5
 y 9
@@ -759,6 +787,7 @@
 sp 28
 x 5
 y 14
+damned 1
 end
 arch woodfloor
 x 5
@@ -1404,10 +1433,6 @@
 x 11
 y 1
 end
-arch woodfloor
-x 11
-y 2
-end
 arch magic_mouth
 msg
 Welcome to Crossfire!
@@ -1422,13 +1447,17 @@
 you'll soon learn the basics of the game.
 
 From here, move south (press your down-arrow key,
-or type 'south &lt;enter&gt;) and press the spacebar to
+or type 'south <enter>) and press the spacebar to
 read the next sign.  Good luck!
 endmsg
 x 11
 y 2
 move_on all
 end
+arch woodfloor
+x 11
+y 2
+end
 arch sign
 name Press space bar to read me
 msg
@@ -1444,7 +1473,7 @@
 you'll soon learn the basics of the game.
 
 From here, move south (press your down-arrow key,
-or type 'south &lt;enter&gt;) and press the space bar to
+or type 'south <enter>) and press the space bar to
 read the next sign.  Good luck!
 endmsg
 x 11
@@ -1750,8 +1779,10 @@
 arch woodfloor
 x 13
 y 3
+move_block all
 end
-arch sage
+arch sign
+name old man
 msg
 @match food|no
 There is some food on the other side of this gate.
@@ -1767,6 +1798,7 @@
 @match *
 Ninety-nine bottles of beer on the wall....
 endmsg
+face sage.x11
 x 13
 y 3
 end
@@ -1869,10 +1901,6 @@
 arch wall_2_1_2
 x 14
 end
-arch woodfloor
-x 14
-y 1
-end
 arch magic_mouth
 msg
 A message scrawled on the wall says:
@@ -1885,6 +1913,10 @@
 x 14
 y 1
 end
+arch woodfloor
+x 14
+y 1
+end
 arch food
 x 14
 y 1
@@ -1996,10 +2028,6 @@
 arch wall_2_1_2
 x 15
 end
-arch woodfloor
-x 15
-y 1
-end
 arch magic_mouth
 msg
 A message scrawled on the wall says:
@@ -2013,6 +2041,10 @@
 x 15
 y 1
 end
+arch woodfloor
+x 15
+y 1
+end
 arch apple
 x 15
 y 1
@@ -2037,10 +2069,6 @@
 x 15
 y 4
 end
-arch woodfloor
-x 15
-y 5
-end
 arch magic_mouth
 msg
 A sign on the wall says:  Slow Down!!
@@ -2050,6 +2078,10 @@
 end
 arch woodfloor
 x 15
+y 5
+end
+arch woodfloor
+x 15
 y 6
 end
 arch wall_2_1_2
@@ -2159,10 +2191,6 @@
 arch wall_2_1_2
 x 16
 end
-arch woodfloor
-x 16
-y 1
-end
 arch magic_mouth
 msg
 A message scrawled on the wall says:
@@ -2174,6 +2202,10 @@
 x 16
 y 1
 end
+arch woodfloor
+x 16
+y 1
+end
 arch heart
 name goblin's heart
 x 16
@@ -2196,36 +2228,31 @@
 msg
 === Talking to People ===
 
-You can also get information from non-player
-characters (NPCs) in the game by talking to them.
+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 I<chat> command, which
+is displayed in blue. All players currently logged in can see that. In CFPlus, you can simply type
+"c some message<return>" to chat with others. There is also the I<shout> command (short "sh")
+for use in emergencies, and I<say> (short "s") which all players on a map and all NPCs near you can hear.
 
-NPCs that can talk to you have a little speech bubble
-sign.
+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 either click on him or
-type: 'say hello
+To talk to the man at the end of this hallway when you're finished reading this,
+walk up next to him and either click on him or type: say hello<return>
 
 Clicking on NPCs lets you use a dialogue 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.
 
-The 'say command will let you talk to nearby
-NPCs and other Crossfire players who are
-on the same map as you, so it is your main
-way to communicate inside the game.  (The "
-(double-quote) key is often a shortcut for 'say.)
-
-Many NPC have useful information, but they
-will only tell you about it if you ask about the
-right things.  Saying "hello" is a good start.
-If the NPC replies, look for words in his reply
-that might be important, and ask about them.
-For example, if he says, "Hello, do you have
-any food?" ask him about food ('say 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
+The say command will let you talk to nearby NPCs and other Crossfire players who are
+on the same map as you, so it is your main way to communicate inside the game.
+
+Many NPC have useful information, but they will only tell you about it if you ask about the
+right things.  Saying "hello" is a good start. If the NPC replies, look for words in his reply
+that might be important, and ask about them. For example, if he says, "Hello, do you have
+any food?" ask him about food ("say 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.
@@ -2325,11 +2352,11 @@
 arch wall_2_1_2
 x 17
 end
-arch woodfloor
+arch magic_mouth
 x 17
 y 1
 end
-arch magic_mouth
+arch woodfloor
 x 17
 y 1
 end
@@ -2820,6 +2847,11 @@
 up and take with you, while others will be
 fixed where they are, but they all may be
 important to read.
+
+In case you can't read, for example when you are
+too low on intelligence or don't have the literacy
+skill you might find the word 'orc-knuckle' useful
+for leaving this tutorial!
 endmsg
 x 20
 y 5