--- cf.schmorp.de/maps/start/tutorial_class.map	2008/12/08 22:33:52	1.3
+++ cf.schmorp.de/maps/start/tutorial_class.map	2009/12/13 00:00:12	1.15
@@ -2,7 +2,7 @@
 file_format_version 1
 name Tutorial Class Selection
 region creation
-width 40
+width 42
 height 16
 enter_x 7
 enter_y 5
@@ -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
@@ -361,7 +374,7 @@
 arch exit
 slaying tutorial_part1
 hp 4
-sp 18
+sp 23
 x 4
 end
 arch footpath_2_1_1
@@ -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 map, 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
@@ -1037,12 +1085,12 @@
 arch button_small
 x 10
 y 7
-connected 1
+connected 2
 end
 arch button_small
 x 10
 y 8
-connected 1
+connected 2
 end
 arch grass
 x 10
@@ -1051,7 +1099,7 @@
 arch grate_closed_1
 x 10
 y 8
-connected 1
+connected 2
 end
 arch grass
 x 10
@@ -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
@@ -1261,12 +1322,12 @@
 arch button_small
 x 12
 y 7
-connected 1
+connected 3
 end
 arch button_small
 x 12
 y 8
-connected 1
+connected 3
 end
 arch grass
 x 12
@@ -1275,7 +1336,7 @@
 arch grate_closed_1
 x 12
 y 8
-connected 1
+connected 3
 end
 arch grass
 x 12
@@ -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
@@ -1498,12 +1550,12 @@
 arch button_small
 x 14
 y 7
-connected 1
+connected 4
 end
 arch button_small
 x 14
 y 8
-connected 1
+connected 4
 end
 arch grass
 x 14
@@ -1512,7 +1564,7 @@
 arch grate_closed_1
 x 14
 y 8
-connected 1
+connected 4
 end
 arch grass
 x 14
@@ -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
@@ -1588,7 +1644,7 @@
 name Hall of Thieves
 msg
 Thieves and Ninjas prefer a subtler approach to killing, or even avoid killing altogether.
-Why risk your life needlessly in fightsa when you can just hide
+Why risk your life needlessly in fights when you can just hide
 in the shadows and steal the treasure?
 endmsg
 x 15
@@ -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
@@ -1722,12 +1787,12 @@
 arch button_small
 x 16
 y 7
-connected 1
+connected 5
 end
 arch button_small
 x 16
 y 8
-connected 1
+connected 5
 end
 arch grass
 x 16
@@ -1736,7 +1801,7 @@
 arch grate_closed_1
 x 16
 y 8
-connected 1
+connected 5
 end
 arch grass
 x 16
@@ -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
@@ -1961,12 +2017,12 @@
 arch button_small
 x 18
 y 7
-connected 1
+connected 6
 end
 arch button_small
 x 18
 y 8
-connected 1
+connected 6
 end
 arch grass
 x 18
@@ -1975,7 +2031,7 @@
 arch grate_closed_1
 x 18
 y 8
-connected 1
+connected 6
 end
 arch grass
 x 18
@@ -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
@@ -2184,12 +2253,12 @@
 arch button_small
 x 20
 y 7
-connected 1
+connected 7
 end
 arch button_small
 x 20
 y 8
-connected 1
+connected 7
 end
 arch grass
 x 20
@@ -2198,7 +2267,7 @@
 arch grate_closed_1
 x 20
 y 8
-connected 1
+connected 7
 end
 arch grass
 x 20
@@ -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
@@ -2411,12 +2488,12 @@
 arch button_small
 x 22
 y 7
-connected 1
+connected 8
 end
 arch button_small
 x 22
 y 8
-connected 1
+connected 8
 end
 arch grass
 x 22
@@ -2425,7 +2502,7 @@
 arch grate_closed_1
 x 22
 y 8
-connected 1
+connected 8
 end
 arch grass
 x 22
@@ -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
@@ -2643,12 +2733,12 @@
 arch button_small
 x 24
 y 7
-connected 1
+connected 9
 end
 arch button_small
 x 24
 y 8
-connected 1
+connected 9
 end
 arch grass
 x 24
@@ -2657,7 +2747,7 @@
 arch grate_closed_1
 x 24
 y 8
-connected 1
+connected 9
 end
 arch grass
 x 24
@@ -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
@@ -2881,12 +2962,12 @@
 arch button_small
 x 26
 y 7
-connected 1
+connected 10
 end
 arch button_small
 x 26
 y 8
-connected 1
+connected 10
 end
 arch grass
 x 26
@@ -2895,7 +2976,7 @@
 arch grate_closed_1
 x 26
 y 8
-connected 1
+connected 10
 end
 arch grass
 x 26
@@ -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
@@ -3120,12 +3214,12 @@
 arch button_small
 x 28
 y 7
-connected 1
+connected 11
 end
 arch button_small
 x 28
 y 8
-connected 1
+connected 11
 end
 arch grass
 x 28
@@ -3134,7 +3228,7 @@
 arch grate_closed_1
 x 28
 y 8
-connected 1
+connected 11
 end
 arch grass
 x 28
@@ -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,10 +3388,28 @@
 x 30
 y 3
 end
+arch swall_2_1_2
+x 30
+y 3
+end
 arch footpath_2_1_2
 x 30
 y 4
 end
+arch sign
+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
+evokers to mixed classes such as the Warlock you can find almost anything.
+
+It can be useful to have a fighting skill, so beginning players might do well in selecting
+a class that can use a weapon.
+endmsg
+x 30
+y 4
+move_on all
+end
 arch grass
 x 30
 y 5
@@ -3337,12 +3453,12 @@
 arch button_small
 x 30
 y 7
-connected 1
+connected 12
 end
 arch button_small
 x 30
 y 8
-connected 1
+connected 12
 end
 arch grass
 x 30
@@ -3351,7 +3467,7 @@
 arch grate_closed_1
 x 30
 y 8
-connected 1
+connected 12
 end
 arch grass
 x 30
@@ -3425,23 +3541,13 @@
 x 31
 y 3
 end
-arch footpath_2_1_2
+arch swall_2_1_2
 x 31
-y 4
+y 3
 end
-arch sign
-name Hall of Magicians
-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
-evokers to mixed classes such as the Warlock you can find almost anything.
-
-It can be useful to have a fighting skill, so beginning players might do well in selecting
-a class that can use a weapon.
-endmsg
+arch footpath_2_1_2
 x 31
 y 4
-move_on all
 end
 arch grass
 x 31
@@ -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
@@ -3540,37 +3655,35 @@
 y 6
 end
 arch sign
-name Sorcerer
+name Pyromancer
 msg
-Your study of magic has been
-obsessive. Your frequent practice
-has greatly enhanced your powers, and
-your intellect has been sharpened
-enormously by your quest for ever
-better ways to channel energies.
+You've been obsessed with fire and magic
+ever since you were a child. As time grew
+on you've learned to master both.
 
-However, you've totally neglected to
-learn to use weaponry, and you're
-soft and weak. Barbarians used to
-push you around on the street until
-you blasted one's leg off with a
-lightning bolt. You reflected later
-on the stupidity of this, because you
-could by no means have blasted his
-friends, too. Fortunately, they ran
-off.
+You've never learned to use magic
+innately, but instead rely on a magic
+talisman to channel mana for you.
 
-You resolved to learn how to
-take out a whole group of barbarians
-before losing your temper again.
+The your fire spells have imprinted
+themselves somewhat on your talisman,
+making it good for those and less
+useful for anything else.
 
-Your study of magic and magical
-devices allows you to notice when an
-object has a magical aura, and you
-can often fathom the purpose of
-magical devices.
+You've had some training in the use of one handed weapons
+to help defend yourself, but you tend
+to leave most of the fighting to
+others, so your physical training has
+been somewhat lacking.
 
-This is a relatively difficult class to play.
+You have not been trained in
+religious devotion: however, you
+come from a religious family and will
+have no particular difficulty taking
+up the service of a god.
+
+This is a relatively good class for beginning players
+who are mainly interested in magic.
 endmsg
 x 32
 y 6
@@ -3583,12 +3696,12 @@
 arch button_small
 x 32
 y 7
-connected 1
+connected 13
 end
 arch button_small
 x 32
 y 8
-connected 1
+connected 13
 end
 arch grass
 x 32
@@ -3597,7 +3710,7 @@
 arch grate_closed_1
 x 32
 y 8
-connected 1
+connected 13
 end
 arch grass
 x 32
@@ -3609,7 +3722,8 @@
 sp 12
 x 32
 y 9
-arch sorcerer_class
+carrying 70000
+arch pyromancer_class
 end
 end
 arch grass
@@ -3617,8 +3731,7 @@
 y 10
 move_block all
 end
-arch sorcerer_class
-face sorcerer.x51
+arch pyromancer_class
 x 32
 y 10
 end
@@ -3662,10 +3775,18 @@
 x 33
 y 2
 end
+arch grasspond
+x 33
+y 2
+end
 arch grass
 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 +3875,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
@@ -3767,28 +3892,35 @@
 y 6
 end
 arch sign
-name Summoner
+name Sorcerer
 msg
-You've had more of an emphasis on
-physical training than most
-spellcasters, at the expense of less
-time spent on casting spells.
-
-You've never learned to use magic innately,
-but instead rely on a magic talisman
-to channel mana for you.
+Your study of magic has been
+obsessive. Your frequent practice
+has greatly enhanced your powers, and
+your intellect has been sharpened
+enormously by your quest for ever
+better ways to channel energies.
 
-Your work has leaned heavily toward the art of
-summoning creatures to help you in a
-fight, and your talisman has become
-attuned to that. That attunement,
-however, makes it harder for you to
-reject unwanted creatures.
+However, you've totally neglected to
+learn to use weaponry, and you're
+soft and weak. Barbarians used to
+push you around on the street until
+you blasted one's leg off with a
+lightning bolt. You reflected later
+on the stupidity of this, because you
+could by no means have blasted his
+friends, too. Fortunately, they ran
+off.
 
-You've also had a reasonable education in
-religious devotion.
+You resolved to learn how to
+take out a whole group of barbarians
+before losing your temper again.
 
-You can make use of one handed weapons, if need be.
+Your study of magic and magical
+devices allows you to notice when an
+object has a magical aura, and you
+can often fathom the purpose of
+magical devices.
 
 This is a relatively difficult class to play.
 endmsg
@@ -3803,12 +3935,12 @@
 arch button_small
 x 34
 y 7
-connected 1
+connected 14
 end
 arch button_small
 x 34
 y 8
-connected 1
+connected 14
 end
 arch grass
 x 34
@@ -3817,7 +3949,7 @@
 arch grate_closed_1
 x 34
 y 8
-connected 1
+connected 14
 end
 arch grass
 x 34
@@ -3829,7 +3961,7 @@
 sp 12
 x 34
 y 9
-arch summoner_class
+arch sorcerer_class
 end
 end
 arch grass
@@ -3837,8 +3969,8 @@
 y 10
 move_block all
 end
-arch summoner_class
-face wizard_yellow.x51
+arch sorcerer_class
+face sorcerer.x51
 x 34
 y 10
 end
@@ -3886,6 +4018,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 +4078,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,7 +4115,11 @@
 x 36
 y 3
 end
-arch footpath_1_3
+arch swall_2_1_2
+x 36
+y 3
+end
+arch footpath_2_1_2
 x 36
 y 4
 end
@@ -3987,34 +4132,30 @@
 y 6
 end
 arch sign
-name Alchemist
+name Summoner
 msg
-Your specialty is magical devices and
-concoctions, but you've also had some
-training in one handed weapons, so that you can
-fend off townsfolk angered by the
-vile reeks that frequently emanate
-from your workshop.
+You've had more of an emphasis on
+physical training than most
+spellcasters, at the expense of less
+time spent on casting spells.
 
-Searching for the perfect recipes and
-trying to recover lost knowledge has
-sharpened your wits considerably.
+You've never learned to use magic innately,
+but instead rely on a magic talisman
+to channel mana for you.
 
-However, this has left little time for
-physical training, and your sedentary
-lifestyle has weakened you very much.
+Your work has leaned heavily toward the art of
+summoning creatures to help you in a
+fight, and your talisman has become
+attuned to that. That attunement,
+however, makes it harder for you to
+reject unwanted creatures.
 
-Your dependence on magical devices
-extends to the use of a talisman to
-channel mana. The talisman has
-become attuned to detonation and
-transmutation because of the way you
-have used it.
+You've also had a reasonable education in
+religious devotion.
 
-Your ability to create, uhm, "gold" out of anything
-is always a good way to impress townsfolk.
+You can make use of one handed weapons, if need be.
 
-This is a difficult class to play.
+This is a relatively difficult class to play.
 endmsg
 x 36
 y 6
@@ -4027,12 +4168,12 @@
 arch button_small
 x 36
 y 7
-connected 1
+connected 15
 end
 arch button_small
 x 36
 y 8
-connected 1
+connected 15
 end
 arch grass
 x 36
@@ -4041,7 +4182,7 @@
 arch grate_closed_1
 x 36
 y 8
-connected 1
+connected 15
 end
 arch grass
 x 36
@@ -4053,7 +4194,7 @@
 sp 12
 x 36
 y 9
-arch alchemist_class
+arch summoner_class
 end
 end
 arch grass
@@ -4061,7 +4202,8 @@
 y 10
 move_block all
 end
-arch alchemist_class
+arch summoner_class
+face wizard_yellow.x51
 x 36
 y 10
 end
@@ -4077,7 +4219,7 @@
 x 36
 y 12
 end
-arch footpath_1_3
+arch footpath_2_1_2
 x 36
 y 13
 end
@@ -4101,27 +4243,19 @@
 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
-arch grass
+arch footpath_2_1_2
 x 37
 y 4
 end
@@ -4129,23 +4263,15 @@
 x 37
 y 5
 end
-arch swall_1_1
-x 37
-y 5
-end
 arch grass
 x 37
 y 6
 end
-arch swall_2_1_1
-x 37
-y 6
-end
 arch grass
 x 37
 y 7
 end
-arch swall_2_1_1
+arch swall_1_1
 x 37
 y 7
 end
@@ -4185,12 +4311,7 @@
 x 37
 y 12
 end
-arch sign_w
-name Left Please
-x 37
-y 12
-end
-arch grass
+arch footpath_2_1_2
 x 37
 y 13
 end
@@ -4222,23 +4343,13 @@
 x 38
 y 3
 end
-arch grass
+arch swall_2_1_2
 x 38
-y 4
+y 3
 end
-arch sign
-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
-burden of a so-called "class" forced onto them.
-
-By choosing to go through this exit, your character will not be changed in any way.
-endmsg
+arch footpath_2_1_2
 x 38
 y 4
-move_on all
 end
 arch grass
 x 38
@@ -4249,10 +4360,34 @@
 y 6
 end
 arch sign
-name Classless
+name Alchemist
 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.
+Your specialty is magical devices and
+concoctions, but you've also had some
+training in one handed weapons, so that you can
+fend off townsfolk angered by the
+vile reeks that frequently emanate
+from your workshop.
+
+Searching for the perfect recipes and
+trying to recover lost knowledge has
+sharpened your wits considerably.
+
+However, this has left little time for
+physical training, and your sedentary
+lifestyle has weakened you very much.
+
+Your dependence on magical devices
+extends to the use of a talisman to
+channel mana. The talisman has
+become attuned to detonation and
+transmutation because of the way you
+have used it.
+
+Your ability to create, uhm, "gold" out of anything
+is always a good way to impress townsfolk.
+
+This is a difficult class to play.
 endmsg
 x 38
 y 6
@@ -4265,12 +4400,12 @@
 arch button_small
 x 38
 y 7
-connected 1
+connected 16
 end
 arch button_small
 x 38
 y 8
-connected 1
+connected 16
 end
 arch grass
 x 38
@@ -4279,26 +4414,27 @@
 arch grate_closed_1
 x 38
 y 8
-connected 1
+connected 16
 end
 arch grass
 x 38
 y 9
 end
-arch exit
+arch player_changer
 slaying /start/tutorial_class
 hp 38
 sp 12
 x 38
 y 9
-damned 1
+arch alchemist_class
+end
 end
 arch grass
 x 38
 y 10
 move_block all
 end
-arch minesweeper-unknown
+arch alchemist_class
 x 38
 y 10
 end
@@ -4314,7 +4450,7 @@
 x 38
 y 12
 end
-arch grass
+arch footpath_2_1_2
 x 38
 y 13
 end
@@ -4338,31 +4474,19 @@
 x 39
 y 1
 end
-arch wall_1_1
-x 39
-y 1
-end
 arch grass
 x 39
 y 2
 end
-arch wall_2_1_1
-x 39
-y 2
-end
 arch grass
 x 39
 y 3
 end
-arch wall_2_1_1
+arch swall_2_1_2
 x 39
 y 3
 end
-arch grass
-x 39
-y 4
-end
-arch wall_2_1_1
+arch footpath_1_3
 x 39
 y 4
 end
@@ -4370,7 +4494,7 @@
 x 39
 y 5
 end
-arch wall_2_1_1
+arch swall_1_1
 x 39
 y 5
 end
@@ -4378,7 +4502,7 @@
 x 39
 y 6
 end
-arch wall_2_1_1
+arch swall_2_1_1
 x 39
 y 6
 end
@@ -4386,7 +4510,7 @@
 x 39
 y 7
 end
-arch wall_2_1_1
+arch swall_2_1_1
 x 39
 y 7
 end
@@ -4394,7 +4518,7 @@
 x 39
 y 8
 end
-arch wall_2_1_1
+arch swall_2_1_1
 x 39
 y 8
 end
@@ -4402,7 +4526,7 @@
 x 39
 y 9
 end
-arch wall_2_1_1
+arch swall_2_1_1
 x 39
 y 9
 end
@@ -4410,7 +4534,7 @@
 x 39
 y 10
 end
-arch wall_2_1_1
+arch swall_2_1_1
 x 39
 y 10
 end
@@ -4418,43 +4542,314 @@
 x 39
 y 11
 end
-arch wall_2_1_1
+arch swall_3_1
 x 39
 y 11
 end
-arch swall_1_3_half
+arch grass
 x 39
-y 11
+y 12
+end
+arch sign_w
+name Left Please
+x 39
+y 12
+end
+arch footpath_2_1_2
+x 39
+y 13
+end
+arch grass
+x 39
+y 14
 end
 arch grass
 x 39
+y 15
+end
+arch wall_2_1_2
+x 39
+y 15
+end
+arch evergreen
+x 40
+move_block all
+end
+arch grass
+x 40
+y 1
+end
+arch grass
+x 40
+y 2
+end
+arch grass
+x 40
+y 3
+end
+arch swall_2_1_2
+x 40
+y 3
+end
+arch grass
+x 40
+y 4
+end
+arch sign
+name Hall of Do not Use
+msg
+Also known as the Hall of Special Tastes.
+
+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 40
+y 4
+move_on all
+end
+arch grass
+x 40
+y 5
+end
+arch grass
+x 40
+y 6
+end
+arch sign
+name Classless
+msg
+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 40
+y 6
+move_on all
+end
+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 40
+y 7
+end
+arch magic_ear
+msg
+@match I know
+Ok, you wanted it that way!
+endmsg
+x 40
+y 7
+connected 17
+end
+arch grass
+x 40
+y 7
+end
+arch button_small
+x 40
+y 8
+connected 17
+end
+arch grass
+x 40
+y 8
+end
+arch grate_closed_1
+x 40
+y 8
+connected 17
+end
+arch grass
+x 40
+y 9
+end
+arch exit
+slaying /start/tutorial_class
+hp 40
+sp 12
+x 40
+y 9
+damned 1
+end
+arch grass
+x 40
+y 10
+move_block all
+end
+arch minesweeper-unknown
+x 40
+y 10
+end
+arch grass
+x 40
+y 11
+end
+arch swall_2_1_2
+x 40
+y 11
+end
+arch grass
+x 40
 y 12
 end
+arch footpath_1_3
+x 40
+y 13
+end
+arch grass
+x 40
+y 14
+end
+arch grass
+x 40
+y 15
+end
+arch wall_2_1_2
+x 40
+y 15
+end
+arch evergreen
+x 41
+move_block all
+end
+arch grass
+x 41
+y 1
+end
+arch wall_1_1
+x 41
+y 1
+end
+arch grass
+x 41
+y 2
+end
 arch wall_2_1_1
-x 39
+x 41
+y 2
+end
+arch grass
+x 41
+y 3
+end
+arch wall_2_1_1
+x 41
+y 3
+end
+arch swall_1_3_half
+x 41
+y 3
+end
+arch grass
+x 41
+y 4
+end
+arch wall_2_1_1
+x 41
+y 4
+end
+arch grass
+x 41
+y 5
+end
+arch wall_2_1_1
+x 41
+y 5
+end
+arch grass
+x 41
+y 6
+end
+arch wall_2_1_1
+x 41
+y 6
+end
+arch grass
+x 41
+y 7
+end
+arch wall_2_1_1
+x 41
+y 7
+end
+arch grass
+x 41
+y 8
+end
+arch wall_2_1_1
+x 41
+y 8
+end
+arch grass
+x 41
+y 9
+end
+arch wall_2_1_1
+x 41
+y 9
+end
+arch grass
+x 41
+y 10
+end
+arch wall_2_1_1
+x 41
+y 10
+end
+arch grass
+x 41
+y 11
+end
+arch wall_2_1_1
+x 41
+y 11
+end
+arch swall_1_3_half
+x 41
+y 11
+end
+arch grass
+x 41
+y 12
+end
+arch wall_2_1_1
+x 41
 y 12
 end
 arch grass
-x 39
+x 41
 y 13
 end
 arch wall_2_1_1
-x 39
+x 41
 y 13
 end
 arch grass
-x 39
+x 41
 y 14
 end
 arch wall_2_1_1
-x 39
+x 41
 y 14
 end
 arch grass
-x 39
+x 41
 y 15
 end
 arch wall_3_4
-x 39
+x 41
 y 15
 end