--- deliantra/maps/start/tutorial.map	2007/06/26 19:34:22	1.9
+++ deliantra/maps/start/tutorial.map	2007/08/03 01:50:42	1.14
@@ -117,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
@@ -216,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
@@ -236,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
-x 2
-y 2
-end
-arch shop_general
+arch shop_wands
 x 2
 y 2
 end
-arch woodfloor
-x 2
-y 3
-end
-arch shop_food
+arch shop_armour
 x 2
 y 3
 end
@@ -370,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
@@ -382,7 +359,7 @@
 x 3
 y 4
 end
-arch shop_floor
+arch shop_general
 x 3
 y 4
 end
@@ -461,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
@@ -474,16 +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.)
-
-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
+arch woodfloor
 x 3
 y 14
 end
@@ -549,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
@@ -679,6 +670,7 @@
 y 6
 end
 arch teleporter
+slaying tutorial
 hp 5
 sp 3
 x 5
@@ -761,6 +753,7 @@
 sp 28
 x 5
 y 14
+damned 1
 end
 arch woodfloor
 x 5
@@ -1406,10 +1399,6 @@
 x 11
 y 1
 end
-arch woodfloor
-x 11
-y 2
-end
 arch magic_mouth
 msg
 Welcome to Crossfire!
@@ -1431,6 +1420,10 @@
 y 2
 move_on all
 end
+arch woodfloor
+x 11
+y 2
+end
 arch sign
 name Press space bar to read me
 msg
@@ -1874,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:
@@ -1890,6 +1879,10 @@
 x 14
 y 1
 end
+arch woodfloor
+x 14
+y 1
+end
 arch food
 x 14
 y 1
@@ -2001,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:
@@ -2018,6 +2007,10 @@
 x 15
 y 1
 end
+arch woodfloor
+x 15
+y 1
+end
 arch apple
 x 15
 y 1
@@ -2042,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!!
@@ -2055,6 +2044,10 @@
 end
 arch woodfloor
 x 15
+y 5
+end
+arch woodfloor
+x 15
 y 6
 end
 arch wall_2_1_2
@@ -2122,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
@@ -2164,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:
@@ -2179,6 +2175,10 @@
 x 16
 y 1
 end
+arch woodfloor
+x 16
+y 1
+end
 arch heart
 name goblin's heart
 x 16
@@ -2325,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
@@ -2761,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
@@ -3038,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
@@ -3190,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