--- cf.schmorp.de/maps/start/tutorial_class.map	2008/12/10 10:46:09	1.5
+++ cf.schmorp.de/maps/start/tutorial_class.map	2008/12/13 22:27:16	1.7
@@ -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
@@ -147,10 +144,6 @@
 x 1
 y 7
 end
-arch swall_2_1_2
-x 1
-y 7
-end
 arch grass
 x 1
 y 8
@@ -213,10 +206,6 @@
 x 2
 y 4
 end
-arch grasspond
-x 2
-y 4
-end
 arch grass
 x 2
 y 5
@@ -229,10 +218,6 @@
 x 2
 y 7
 end
-arch swall_2_1_2
-x 2
-y 7
-end
 arch grass
 x 2
 y 8
@@ -283,35 +268,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
@@ -383,7 +391,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,12 +399,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<Be aware: Once you have choosen a class you can't go back!>
+B<Note: You cannot go back to the first part of the tutorial after you have selected a class!>
 
-You can only delete your character and run through the character creation once again.
-(To delete your character use the B<quit_character> command.)
+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.
@@ -409,15 +417,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
@@ -470,18 +478,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
@@ -490,15 +513,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
@@ -568,6 +591,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
@@ -576,15 +603,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
@@ -635,9 +662,6 @@
 arch grass
 x 7
 end
-arch swall_1_1_half
-x 7
-end
 arch wall_2_2_4
 x 7
 end
@@ -645,23 +669,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
@@ -673,7 +689,7 @@
 x 7
 y 5
 end
-arch swall_1_1
+arch swall_2_2_3
 x 7
 y 5
 end
@@ -689,7 +705,7 @@
 x 7
 y 7
 end
-arch swall_3_4
+arch swall_2_1_1
 x 7
 y 7
 end
@@ -766,6 +782,10 @@
 x 8
 y 3
 end
+arch swall_2_1_2
+x 8
+y 3
+end
 arch footpath_3_3
 x 8
 y 4
@@ -886,6 +906,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
@@ -978,6 +1002,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
@@ -1128,6 +1156,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
@@ -1184,6 +1216,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
@@ -1216,6 +1253,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
@@ -1340,23 +1381,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
@@ -1424,11 +1457,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
@@ -1461,6 +1489,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
@@ -1585,6 +1617,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
@@ -1652,6 +1688,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
@@ -1684,6 +1725,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
@@ -1802,23 +1847,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
@@ -1886,11 +1923,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
@@ -1923,6 +1955,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
@@ -2053,6 +2089,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
@@ -2109,6 +2149,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
@@ -2141,6 +2186,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
@@ -2272,6 +2321,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
@@ -2371,6 +2424,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
@@ -2511,6 +2568,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
@@ -2567,6 +2628,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
@@ -2599,7 +2665,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
@@ -2723,23 +2793,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
@@ -2807,11 +2869,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
@@ -2844,6 +2901,10 @@
 x 26
 y 3
 end
+arch swall_2_1_2
+x 26
+y 3
+end
 arch footpath_3_3
 x 26
 y 4
@@ -2982,6 +3043,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
@@ -3038,6 +3103,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
@@ -3070,6 +3140,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
@@ -3207,6 +3281,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
@@ -3295,6 +3373,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
@@ -3430,12 +3512,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
@@ -3500,6 +3586,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
@@ -3532,6 +3623,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
@@ -3671,6 +3766,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
@@ -3759,6 +3858,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
@@ -3891,6 +3994,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
@@ -3947,6 +4054,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
@@ -3979,6 +4091,10 @@
 x 36
 y 3
 end
+arch swall_2_1_2
+x 36
+y 3
+end
 arch footpath_1_3
 x 36
 y 4
@@ -4106,23 +4222,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
@@ -4190,11 +4298,6 @@
 x 37
 y 12
 end
-arch sign_w
-name Left Please
-x 37
-y 12
-end
 arch grass
 x 37
 y 13
@@ -4227,6 +4330,10 @@
 x 38
 y 3
 end
+arch swall_2_1_2
+x 38
+y 3
+end
 arch grass
 x 38
 y 4
@@ -4256,8 +4363,8 @@
 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!>
 endmsg
 x 38
 y 6
@@ -4363,6 +4470,10 @@
 x 39
 y 3
 end
+arch swall_1_3_half
+x 39
+y 3
+end
 arch grass
 x 39
 y 4