--- deliantra/maps/start/tutorial.map	2007/06/07 19:53:38	1.5
+++ deliantra/maps/start/tutorial.map	2007/08/03 01:50:42	1.14
@@ -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
@@ -119,27 +117,15 @@
 arch wall_2_1_2
 x 1
 end
-arch woodfloor
-x 1
-y 1
-end
-arch shop_general
+arch shop_ring
 x 1
 y 1
 end
-arch woodfloor
-x 1
-y 2
-end
-arch shop_weapon
+arch shop_throw
 x 1
 y 2
 end
-arch woodfloor
-x 1
-y 3
-end
-arch shop_general
+arch shop_food
 x 1
 y 3
 end
@@ -218,8 +204,9 @@
 arch sign
 name Congratulations
 msg
-Congratulations, you have completed this part of the tutorial!  Take the exit to your east to move on.  Step carefully around the gravestone of Harold, who didn't pay very close attention and paid the price. :-)
-
+Congratulations, you have completed this part of the tutorial!
+Take the exit to your east to move on.
+Step carefully around the gravestone of Harold, who didn't pay very close attention and paid the price. :-)
 endmsg
 x 1
 y 14
@@ -238,27 +225,19 @@
 arch wall_2_1_2
 x 2
 end
-arch woodfloor
+arch shop_empty
 x 2
 y 1
 end
-arch shop_armour
+arch shop_mat
 x 2
 y 1
 end
-arch woodfloor
+arch shop_wands
 x 2
 y 2
 end
-arch shop_general
-x 2
-y 2
-end
-arch woodfloor
-x 2
-y 3
-end
-arch shop_food
+arch shop_armour
 x 2
 y 3
 end
@@ -372,11 +351,7 @@
 x 3
 y 2
 end
-arch woodfloor
-x 3
-y 3
-end
-arch shop_mat
+arch shop_weapon
 x 3
 y 3
 end
@@ -384,7 +359,7 @@
 x 3
 y 4
 end
-arch shop_floor
+arch shop_general
 x 3
 y 4
 end
@@ -463,7 +438,17 @@
 x 3
 y 13
 end
-arch woodfloor
+arch magic_mouth
+msg
+What is the password? (Use the I<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 cannot read, you need
+to go back to the place where you found it and listen to the magic voice.)
+
+If you get stuck here and need help, try to talk to other players using the I<chat> command. To do
+so, enter I<c help me, I am stuck in the tutorial> or something to that extent.
+endmsg
 x 3
 y 14
 end
@@ -476,12 +461,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
@@ -547,6 +527,19 @@
 x 4
 y 6
 end
+arch check_floor
+race mouse
+x 4
+y 7
+last_sp 0
+move_block all
+end
+arch mat
+name mouse barrier
+name_pl 
+x 4
+y 7
+end
 arch woodfloor
 x 4
 y 7
@@ -677,6 +670,7 @@
 y 6
 end
 arch teleporter
+slaying tutorial
 hp 5
 sp 3
 x 5
@@ -759,6 +753,7 @@
 sp 28
 x 5
 y 14
+damned 1
 end
 arch woodfloor
 x 5
@@ -1404,10 +1399,6 @@
 x 11
 y 1
 end
-arch woodfloor
-x 11
-y 2
-end
 arch magic_mouth
 msg
 Welcome to Crossfire!
@@ -1422,13 +1413,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 +1439,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
@@ -1872,10 +1867,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:
@@ -1888,6 +1879,10 @@
 x 14
 y 1
 end
+arch woodfloor
+x 14
+y 1
+end
 arch food
 x 14
 y 1
@@ -1999,10 +1994,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:
@@ -2016,6 +2007,10 @@
 x 15
 y 1
 end
+arch woodfloor
+x 15
+y 1
+end
 arch apple
 x 15
 y 1
@@ -2040,10 +2035,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!!
@@ -2053,6 +2044,10 @@
 end
 arch woodfloor
 x 15
+y 5
+end
+arch woodfloor
+x 15
 y 6
 end
 arch wall_2_1_2
@@ -2120,6 +2115,13 @@
 x 15
 y 12
 end
+arch check_floor
+race ant
+x 15
+y 13
+last_sp 0
+move_block all
+end
 arch woodfloor
 x 15
 y 13
@@ -2162,10 +2164,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:
@@ -2177,6 +2175,10 @@
 x 16
 y 1
 end
+arch woodfloor
+x 16
+y 1
+end
 arch heart
 name goblin's heart
 x 16
@@ -2199,36 +2201,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.
@@ -2328,11 +2325,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
@@ -2764,32 +2761,28 @@
 x 20
 y 2
 end
-arch woodfloor
-x 20
-y 3
-end
 arch magic_mouth
 msg
-A sign on the wall says:
+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
-middle-clicking or whatever action your client
-uses to apply inventory items.)  You may wish
-to read it first (press space), and then pick it up
-(press the comma key or type 'take).  Now it
-will be in your inventory, so you can read it
-anytime you need to.
+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
+middle-clicking or whatever action your client uses to apply inventory items.)  You may wish
+to read it first (press space), and then pick it up (press the comma key or type 'take).  Now it
+will be in your inventory, so you can read it anytime you need to.
 
+Oh, and remember one thing: the password is B<orc-knuckle>.
 endmsg
 x 20
 y 3
 end
+arch woodfloor
+x 20
+y 3
+end
 arch note
 msg
-The exit password is "orc-knuckle"!  (Save this note; you'll need it much later, after you meet Harold.)
+The exit password is B<orc-knuckle>!  (Save this note; you'll need it much later, after you meet Harold.)
 endmsg
 x 20
 y 3
@@ -2823,6 +2816,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
@@ -3036,6 +3034,13 @@
 x 21
 y 13
 end
+arch check_floor
+race ant
+x 21
+y 14
+last_sp 0
+move_block all
+end
 arch woodfloor
 x 21
 y 14
@@ -3188,6 +3193,13 @@
 x 22
 y 11
 end
+arch check_floor
+race ant
+x 22
+y 12
+last_sp 0
+move_block all
+end
 arch woodfloor
 x 22
 y 12