--- cf.schmorp.de/maps/start/tutorial_class.map	2008/12/09 11:42:56	1.4
+++ cf.schmorp.de/maps/start/tutorial_class.map	2008/12/23 22:34:52	1.10
@@ -56,9 +56,6 @@
 arch grass
 y 7
 end
-arch swall_1_4_half
-y 7
-end
 arch wall_2_1_1
 y 7
 end
@@ -83,9 +80,6 @@
 arch grass
 y 11
 end
-arch swall_1_4_half
-y 11
-end
 arch wall_2_1_1
 y 11
 end
@@ -147,10 +141,6 @@
 x 1
 y 7
 end
-arch swall_2_1_2
-x 1
-y 7
-end
 arch grass
 x 1
 y 8
@@ -167,10 +157,6 @@
 x 1
 y 11
 end
-arch swall_2_1_2
-x 1
-y 11
-end
 arch grass
 x 1
 y 12
@@ -213,10 +199,6 @@
 x 2
 y 4
 end
-arch grasspond
-x 2
-y 4
-end
 arch grass
 x 2
 y 5
@@ -229,10 +211,6 @@
 x 2
 y 7
 end
-arch swall_2_1_2
-x 2
-y 7
-end
 arch grass
 x 2
 y 8
@@ -253,10 +231,6 @@
 x 2
 y 11
 end
-arch swall_2_1_2
-x 2
-y 11
-end
 arch grass
 x 2
 y 12
@@ -283,35 +257,58 @@
 arch wall_1_3
 x 3
 end
+arch swall_1_1_half
+x 3
+end
 arch grass
 x 3
 y 1
 end
+arch swall_2_1_1
+x 3
+y 1
+end
 arch grass
 x 3
 y 2
 end
+arch swall_2_1_1
+x 3
+y 2
+end
 arch grass
 x 3
 y 3
 end
+arch swall_2_1_1
+x 3
+y 3
+end
 arch grass
 x 3
 y 4
 end
 arch grass
 x 3
-y 5
+y 4
+end
+arch swall_2_1_1
+x 3
+y 4
 end
 arch grass
 x 3
-y 6
+y 5
+end
+arch swall_2_2_1
+x 3
+y 5
 end
 arch grass
 x 3
-y 7
+y 6
 end
-arch swall_2_1_2
+arch grass
 x 3
 y 7
 end
@@ -331,7 +328,7 @@
 x 3
 y 11
 end
-arch swall_2_1_2
+arch swall_2_2_2
 x 3
 y 11
 end
@@ -339,18 +336,34 @@
 x 3
 y 12
 end
+arch swall_2_1_1
+x 3
+y 12
+end
 arch grass
 x 3
 y 13
 end
+arch swall_2_1_1
+x 3
+y 13
+end
 arch grass
 x 3
 y 14
 end
+arch swall_2_1_1
+x 3
+y 14
+end
 arch grass
 x 3
 y 15
 end
+arch swall_1_2_half
+x 3
+y 15
+end
 arch wall_1_3
 x 3
 y 15
@@ -383,7 +396,7 @@
 arch sign
 name Class Selection
 msg
-In this room you can select a B<class> for your character.
+Here you can select a B<class> for your character.
 
 A class modifies your character: you can gain skills and items, and your stats can be modified.
 
@@ -391,7 +404,12 @@
 through the individual class descriptions.
 
 When you have decided on a class, step onto the golden teleporter below the sign.
-Note that you cannot go back to the first part of the tutorial after you selected a class.
+
+B<Note: You cannot go back to the first part of the tutorial after you have selected a class!>
+
+When you are not satisfied with your class the only way to go back is to delete
+your character and run through the character creation once again.  (To delete
+your character use the B<quit_character> command.)
 
 If you are playing for the first time and are a bit overwhelmed, then the B<Warrior> is a good choice
 for fighters, and the B<Warlock> is a good choice for magic users.
@@ -404,15 +422,15 @@
 x 4
 y 5
 end
-arch grass
+arch swall_2_1_2
 x 4
-y 6
+y 5
 end
 arch grass
 x 4
-y 7
+y 6
 end
-arch swall_2_1_2
+arch grass
 x 4
 y 7
 end
@@ -444,6 +462,16 @@
 x 4
 y 13
 end
+arch sign
+name Go south for the second part of the Tutorial
+msg
+The portal to the south will bring you to the second
+(out of three) tutorial maps, where you will learn basic fighting and,
+if you have a ranged weapon or spell, also shooting and/or casting.
+endmsg
+x 4
+y 13
+end
 arch footpath_2_1_1
 x 4
 y 14
@@ -465,18 +493,33 @@
 arch wall_1_4
 x 5
 end
+arch swall_1_1_half
+x 5
+end
 arch grass
 x 5
 y 1
 end
+arch swall_2_1_1
+x 5
+y 1
+end
 arch grass
 x 5
 y 2
 end
+arch swall_2_1_1
+x 5
+y 2
+end
 arch grass
 x 5
 y 3
 end
+arch swall_2_2_1
+x 5
+y 3
+end
 arch footpath_2_1_2
 x 5
 y 4
@@ -485,15 +528,15 @@
 x 5
 y 5
 end
-arch grass
+arch swall_2_1_2
 x 5
-y 6
+y 5
 end
 arch grass
 x 5
-y 7
+y 6
 end
-arch swall_2_1_2
+arch grass
 x 5
 y 7
 end
@@ -563,6 +606,10 @@
 x 6
 y 3
 end
+arch swall_2_1_2
+x 6
+y 3
+end
 arch footpath_2_1_2
 x 6
 y 4
@@ -571,15 +618,15 @@
 x 6
 y 5
 end
-arch grass
+arch swall_2_1_2
 x 6
-y 6
+y 5
 end
 arch grass
 x 6
-y 7
+y 6
 end
-arch swall_2_1_2
+arch grass
 x 6
 y 7
 end
@@ -630,9 +677,6 @@
 arch grass
 x 7
 end
-arch swall_1_1_half
-x 7
-end
 arch wall_2_2_4
 x 7
 end
@@ -640,23 +684,15 @@
 x 7
 y 1
 end
-arch swall_2_1_1
-x 7
-y 1
-end
 arch grass
 x 7
 y 2
 end
-arch swall_2_1_1
-x 7
-y 2
-end
 arch grass
 x 7
 y 3
 end
-arch swall_1_2
+arch swall_2_1_2
 x 7
 y 3
 end
@@ -668,7 +704,7 @@
 x 7
 y 5
 end
-arch swall_1_1
+arch swall_2_2_3
 x 7
 y 5
 end
@@ -684,7 +720,7 @@
 x 7
 y 7
 end
-arch swall_3_4
+arch swall_2_1_1
 x 7
 y 7
 end
@@ -761,6 +797,10 @@
 x 8
 y 3
 end
+arch swall_2_1_2
+x 8
+y 3
+end
 arch footpath_3_3
 x 8
 y 4
@@ -881,6 +921,10 @@
 x 9
 y 3
 end
+arch swall_2_1_2
+x 9
+y 3
+end
 arch footpath_2_1_2
 x 9
 y 4
@@ -973,6 +1017,10 @@
 x 10
 y 3
 end
+arch swall_2_1_2
+x 10
+y 3
+end
 arch footpath_2_1_2
 x 10
 y 4
@@ -1123,6 +1171,10 @@
 x 11
 y 3
 end
+arch swall_2_1_2
+x 11
+y 3
+end
 arch footpath_2_1_2
 x 11
 y 4
@@ -1179,6 +1231,11 @@
 x 11
 y 12
 end
+arch sign_w
+name Left Please
+x 11
+y 12
+end
 arch footpath_2_1_2
 x 11
 y 13
@@ -1211,6 +1268,10 @@
 x 12
 y 3
 end
+arch swall_2_1_2
+x 12
+y 3
+end
 arch footpath_2_1_2
 x 12
 y 4
@@ -1335,23 +1396,15 @@
 x 13
 y 1
 end
-arch swall_1_1
-x 13
-y 1
-end
 arch grass
 x 13
 y 2
 end
-arch swall_2_1_1
-x 13
-y 2
-end
 arch grass
 x 13
 y 3
 end
-arch swall_1_2
+arch swall_2_1_2
 x 13
 y 3
 end
@@ -1419,11 +1472,6 @@
 x 13
 y 12
 end
-arch sign_w
-name Left Please
-x 13
-y 12
-end
 arch footpath_2_1_2
 x 13
 y 13
@@ -1456,6 +1504,10 @@
 x 14
 y 3
 end
+arch swall_2_1_2
+x 14
+y 3
+end
 arch footpath_2_1_2
 x 14
 y 4
@@ -1580,6 +1632,10 @@
 x 15
 y 3
 end
+arch swall_2_1_2
+x 15
+y 3
+end
 arch footpath_2_1_2
 x 15
 y 4
@@ -1647,6 +1703,11 @@
 x 15
 y 12
 end
+arch sign_w
+name Left Please
+x 15
+y 12
+end
 arch footpath_2_1_2
 x 15
 y 13
@@ -1679,6 +1740,10 @@
 x 16
 y 3
 end
+arch swall_2_1_2
+x 16
+y 3
+end
 arch footpath_2_1_2
 x 16
 y 4
@@ -1797,23 +1862,15 @@
 x 17
 y 1
 end
-arch swall_1_1
-x 17
-y 1
-end
 arch grass
 x 17
 y 2
 end
-arch swall_2_1_1
-x 17
-y 2
-end
 arch grass
 x 17
 y 3
 end
-arch swall_1_2
+arch swall_2_1_2
 x 17
 y 3
 end
@@ -1881,11 +1938,6 @@
 x 17
 y 12
 end
-arch sign_w
-name Left Please
-x 17
-y 12
-end
 arch footpath_2_1_2
 x 17
 y 13
@@ -1918,6 +1970,10 @@
 x 18
 y 3
 end
+arch swall_2_1_2
+x 18
+y 3
+end
 arch footpath_2_1_2
 x 18
 y 4
@@ -2048,6 +2104,10 @@
 x 19
 y 3
 end
+arch swall_2_1_2
+x 19
+y 3
+end
 arch footpath_2_1_2
 x 19
 y 4
@@ -2104,6 +2164,11 @@
 x 19
 y 12
 end
+arch sign_w
+name Left Please
+x 19
+y 12
+end
 arch footpath_2_1_2
 x 19
 y 13
@@ -2136,6 +2201,10 @@
 x 20
 y 3
 end
+arch swall_2_1_2
+x 20
+y 3
+end
 arch footpath_2_1_2
 x 20
 y 4
@@ -2267,6 +2336,10 @@
 x 21
 y 3
 end
+arch swall_2_1_2
+x 21
+y 3
+end
 arch footpath_2_1_2
 x 21
 y 4
@@ -2366,6 +2439,10 @@
 x 22
 y 3
 end
+arch swall_2_1_2
+x 22
+y 3
+end
 arch footpath_2_1_2
 x 22
 y 4
@@ -2506,6 +2583,10 @@
 x 23
 y 3
 end
+arch swall_2_1_2
+x 23
+y 3
+end
 arch footpath_2_1_2
 x 23
 y 4
@@ -2562,6 +2643,11 @@
 x 23
 y 12
 end
+arch sign_w
+name Left Please
+x 23
+y 12
+end
 arch footpath_2_1_2
 x 23
 y 13
@@ -2594,7 +2680,11 @@
 x 24
 y 3
 end
-arch grasspond
+arch grass
+x 24
+y 3
+end
+arch swall_2_1_2
 x 24
 y 3
 end
@@ -2718,23 +2808,15 @@
 x 25
 y 1
 end
-arch swall_1_1
-x 25
-y 1
-end
 arch grass
 x 25
 y 2
 end
-arch swall_2_1_1
-x 25
-y 2
-end
 arch grass
 x 25
 y 3
 end
-arch swall_1_2
+arch swall_2_1_2
 x 25
 y 3
 end
@@ -2802,11 +2884,6 @@
 x 25
 y 12
 end
-arch sign_w
-name Left Please
-x 25
-y 12
-end
 arch footpath_2_1_2
 x 25
 y 13
@@ -2839,6 +2916,10 @@
 x 26
 y 3
 end
+arch swall_2_1_2
+x 26
+y 3
+end
 arch footpath_3_3
 x 26
 y 4
@@ -2977,6 +3058,10 @@
 x 27
 y 3
 end
+arch swall_2_1_2
+x 27
+y 3
+end
 arch footpath_2_1_2
 x 27
 y 4
@@ -3033,6 +3118,11 @@
 x 27
 y 12
 end
+arch sign_w
+name Left Please
+x 27
+y 12
+end
 arch footpath_2_1_2
 x 27
 y 13
@@ -3065,6 +3155,10 @@
 x 28
 y 3
 end
+arch swall_2_1_2
+x 28
+y 3
+end
 arch footpath_2_1_2
 x 28
 y 4
@@ -3202,6 +3296,10 @@
 x 29
 y 3
 end
+arch swall_2_1_2
+x 29
+y 3
+end
 arch footpath_2_1_2
 x 29
 y 4
@@ -3290,6 +3388,10 @@
 x 30
 y 3
 end
+arch swall_2_1_2
+x 30
+y 3
+end
 arch footpath_2_1_2
 x 30
 y 4
@@ -3425,12 +3527,16 @@
 x 31
 y 3
 end
+arch swall_2_1_2
+x 31
+y 3
+end
 arch footpath_2_1_2
 x 31
 y 4
 end
 arch sign
-name Hall of Magicians
+name Hall of Mages
 msg
 There are lots of different magic schools, and so the magic classes are the most
 numerous and diverse group. From pure magic users such as summoners or
@@ -3495,6 +3601,11 @@
 x 31
 y 12
 end
+arch sign_w
+name Left Please
+x 31
+y 12
+end
 arch footpath_2_1_2
 x 31
 y 13
@@ -3527,6 +3638,10 @@
 x 32
 y 3
 end
+arch swall_2_1_2
+x 32
+y 3
+end
 arch footpath_2_1_2
 x 32
 y 4
@@ -3666,6 +3781,10 @@
 x 33
 y 3
 end
+arch swall_2_1_2
+x 33
+y 3
+end
 arch footpath_2_1_2
 x 33
 y 4
@@ -3754,6 +3873,10 @@
 x 34
 y 3
 end
+arch swall_2_1_2
+x 34
+y 3
+end
 arch footpath_2_1_2
 x 34
 y 4
@@ -3886,6 +4009,10 @@
 x 35
 y 3
 end
+arch swall_2_1_2
+x 35
+y 3
+end
 arch footpath_2_1_2
 x 35
 y 4
@@ -3942,6 +4069,11 @@
 x 35
 y 12
 end
+arch sign_w
+name Left Please
+x 35
+y 12
+end
 arch footpath_2_1_2
 x 35
 y 13
@@ -3974,6 +4106,10 @@
 x 36
 y 3
 end
+arch swall_2_1_2
+x 36
+y 3
+end
 arch footpath_1_3
 x 36
 y 4
@@ -4101,23 +4237,15 @@
 x 37
 y 1
 end
-arch swall_1_1
-x 37
-y 1
-end
 arch grass
 x 37
 y 2
 end
-arch swall_2_1_1
-x 37
-y 2
-end
 arch grass
 x 37
 y 3
 end
-arch swall_1_2
+arch swall_2_1_2
 x 37
 y 3
 end
@@ -4185,11 +4313,6 @@
 x 37
 y 12
 end
-arch sign_w
-name Left Please
-x 37
-y 12
-end
 arch grass
 x 37
 y 13
@@ -4222,19 +4345,26 @@
 x 38
 y 3
 end
+arch swall_2_1_2
+x 38
+y 3
+end
 arch grass
 x 38
 y 4
 end
 arch sign
-name Hall of Do not Use :)
+name Hall of Do not Use
 msg
 Also known as the Hall of Special Tastes.
 
-Some people prefer to play classes, just like their god created them, without the
+Some people prefer to play classless, just like their god created them, without the
 burden of a so-called "class" forced onto them.
 
+B<Do not choose classless unless you are a deliantra expert and know what you are doing!>
+
 By choosing to go through this exit, your character will not be changed in any way.
+This makes gameplay extremely hard, as many very basic skills are missing.
 endmsg
 x 38
 y 4
@@ -4251,22 +4381,41 @@
 arch sign
 name Classless
 msg
-Step onto this exit only if you are sure you do not want or need a class. Beginning players
-are advised to choose a class, however.
+B<Only step onto this exit if you are sure you do not want or need a class. Beginning players
+are advised to choose a class!>
+
+B<Again, your character will lack most basic skills if you go through here, do not use this exit
+unless you are a deliantra expert and really want this!>
 endmsg
 x 38
 y 6
 move_on all
 end
-arch grass
+arch magic_mouth
+msg
+A voice says:
+
+B<The gods urge you to reconsider your choice!>
+
+If you really want to play classless, despite the drawbacks, say C<I know> (use the C<say> command
+or the C<Map> tab).
+endmsg
 x 38
 y 7
 end
-arch button_small
+arch magic_ear
+msg
+@match I know
+Ok, you wanted it that way!
+endmsg
 x 38
 y 7
 connected 16
 end
+arch grass
+x 38
+y 7
+end
 arch button_small
 x 38
 y 8
@@ -4358,6 +4507,10 @@
 x 39
 y 3
 end
+arch swall_1_3_half
+x 39
+y 3
+end
 arch grass
 x 39
 y 4