--- cf.schmorp.de/maps/start/tutorial_class.map	2008/12/08 21:31:50	1.2
+++ 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
@@ -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 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
@@ -774,16 +814,19 @@
 y 6
 end
 arch sign
+name Warrior
 msg
-Warrior
 As a Warrior you've been trained in
-the art of combat with weapons and in
+the art of combat with all weapons and in
 archery.  Because of your training,
 you're stronger, more agile, and
 hardier than you would be otherwise.
+
 However, your education has neglected
 the magical arts, religious devotion,
 and lacks breadth in general.
+
+This is a good class for a beginning player.
 endmsg
 x 8
 y 6
@@ -878,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
@@ -970,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
@@ -993,30 +1044,35 @@
 y 6
 end
 arch sign
+name Barbarian
 msg
-Barbarian
 Growing up in the howling wilderness,
 you've had no chance to pursue
 anything remotely intellectual, let
-alone learn your letters!  It's
+alone learn your letters! It's
 amazing you ever thought of leaving
 your hovel and going somewhere else,
 you're so ignorant.
-But now you have.  You find that
+
+But now you have. You find that
 you're a lot tougher and stronger
 than these cityfolk, and you know how
 to get around in rough terrain.
+
 You've learned archery in order to
 fill your cookpot, and weaponry is
 second nature to anyone who's had to
 fight with the local orc-tribe over
 food once a month.
+
 You're deeply afraid of magic, and
 it'll be awhile before you get over
 that and develop any facility with
-it.  You've no deep problem with the
+it. You've no deep problem with the
 idea of gods, but you don't know much
 about them.
+
+This class of intermediate difficulty, as Barbarians have great problems with learning new skills and/or spells.
 endmsg
 x 10
 y 6
@@ -1029,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
@@ -1043,7 +1099,7 @@
 arch grate_closed_1
 x 10
 y 8
-connected 1
+connected 2
 end
 arch grass
 x 10
@@ -1115,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
@@ -1171,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
@@ -1203,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
@@ -1216,26 +1285,31 @@
 y 6
 end
 arch sign
+name Swashbuckler
 msg
-Swashbuckler
 On shipboard, you've learned good
 balance and agility, and you've also
-become strong and hardy.  Because of
-occasional oarswork, you and your
+become strong and hardy.
+
+Because of occasional oarswork, you and your
 shipmates have an admirable command
 of rhythm, and you can sing well.
+
 You've learned to make the most of
-your time in port:  after you pass
+your time in port: after you pass
 out drunk in a bar and wake to find
 yourself short your pay, you've found
 ways to acquire new capital, or at
 the very least, talk someone into
 helping you out of your fix.
+
 On numerous occasions, you've taken
 up arms and the bow in defense of
 your ship, so you're facile with
 weapons, but you've had no chance to
 learn any magic or the ways of gods.
+
+This is a relatively difficult class to play.
 endmsg
 x 12
 y 6
@@ -1248,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
@@ -1262,7 +1336,7 @@
 arch grate_closed_1
 x 12
 y 8
-connected 1
+connected 3
 end
 arch grass
 x 12
@@ -1322,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
@@ -1406,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
@@ -1443,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
@@ -1456,19 +1521,23 @@
 y 6
 end
 arch sign
+name Ninja
 msg
-Ninja
 As a member of the secret society of
 the Ninja, you've been taught archery
 and the use of weapons, and also the
-art of combat without weapons.  Your
-style of combat, though, leans very
+art of combat without weapons.
+
+Your style of combat, though, leans very
 much toward the sneak attack, so
 you've been taught how to be
 inconspicuous and how to appear in
-places you're not expected.  You have
-had NO introduction to either
+places you're not expected.
+
+You have had no introduction to either
 religious devotion or magic.
+
+This class is of intermediate difficulty.
 endmsg
 x 14
 y 6
@@ -1481,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
@@ -1495,7 +1564,7 @@
 arch grate_closed_1
 x 14
 y 8
-connected 1
+connected 4
 end
 arch grass
 x 14
@@ -1563,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
@@ -1571,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
@@ -1630,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
@@ -1662,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
@@ -1675,20 +1757,24 @@
 y 6
 end
 arch sign
+name Thief
 msg
-Thief
 As a thief you've learned to steal
 and you're familiar with the value a
 fence will give you on your "finds".
+
 You've had some weaponry training,
 including archery, this being
 advisable to someone who is likely to
 have acrimonious disagreements about
 the ownership of valuable objects.
+
 You've had no time for religious
 devotion or the study of magecraft,
 but your quick wits have kept you
 alive many times.
+
+This is a relatively difficult class to play.
 endmsg
 x 16
 y 6
@@ -1701,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
@@ -1715,7 +1801,7 @@
 arch grate_closed_1
 x 16
 y 8
-connected 1
+connected 5
 end
 arch grass
 x 16
@@ -1776,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
@@ -1860,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
@@ -1897,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
@@ -1910,19 +1987,24 @@
 y 6
 end
 arch sign
+name Priest
 msg
-Priest
 As a priest, you've learned an
 intense devotion to your god, and
 you've learned how to channel the
 energies your god vouchsafes to his
-devotees.  You've been taught the use
+devotees.
+
+You've been taught the use
 of weapons, but only cursorily, and
 your physical training has been
-lacking in general.  Since you're in
-tune with the holy powers, you can
-tell when a god has marked an object
+lacking in general.
+
+Since you're in tune with the holy powers,
+you can tell when a god has marked an object
 as accursed.
+
+This class is of intermediate difficulty.
 endmsg
 x 18
 y 6
@@ -1935,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
@@ -1949,7 +2031,7 @@
 arch grate_closed_1
 x 18
 y 8
-connected 1
+connected 6
 end
 arch grass
 x 18
@@ -2022,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
@@ -2078,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
@@ -2110,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
@@ -2123,24 +2218,29 @@
 y 6
 end
 arch sign
+name Paladin
 msg
-Paladin
 You are a militant priest, with an
-emphasis on 'priest'.  You've been
-taught archery and the use of
+emphasis on 'priest'.
+
+You've been taught archery and the use of
 weapons, but great care has been
-taken that you're doctrinally
-correct.  Now you've been sent out in
+taken that you're doctrinally correct.
+
+Now you've been sent out in
 the world to convert the unrighteous
 and destroy the enemies of the faith,
 and your churchmembers have been
 charged a pretty penny to equip you
 to do it!
+
 All other areas of your education
-have been neglected.  Perhaps aware
+have been neglected. Perhaps aware
 of your deficiency, your superiors
 have given you a measure of
-protection from magic.
+protection from physical attacks.
+
+This is a good class for beginning players.
 endmsg
 x 20
 y 6
@@ -2153,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
@@ -2167,7 +2267,7 @@
 arch grate_closed_1
 x 20
 y 8
-connected 1
+connected 7
 end
 arch grass
 x 20
@@ -2236,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
@@ -2335,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
@@ -2348,19 +2456,26 @@
 y 6
 end
 arch sign
+name Monk
 msg
-Monk
 In the Monastery, they believed in
 mental discipline and peace through
 physical training, meditation, and,
 to a lesser extent, religious
-devotion.  Your mental equilibrium
+devotion.
+
+Your mental equilibrium
 requires you to forego the use of
 weapons, but your physical training
-in karate means you're not helpless.
+in karate means you're not helpless,
+and you can make use of archery when
+necessary.
+
 Your inner peacefulness grants you
 the ability to regenerate faster and
 to sense auras.
+
+This class is of intermediate difficulty, as monks cannot use any weapons.
 endmsg
 x 22
 y 6
@@ -2373,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
@@ -2387,7 +2502,7 @@
 arch grate_closed_1
 x 22
 y 8
-connected 1
+connected 8
 end
 arch grass
 x 22
@@ -2468,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
@@ -2524,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
@@ -2556,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
@@ -2573,22 +2701,26 @@
 y 6
 end
 arch sign
+name Devotee
 msg
-Devotee
 The axis of your existence is your
-devotion to your god.  However,
+devotion to your god. However,
 you've also been busy in other areas.
+
 Your sensitivity to godly powers has
 also caused your natural magical
 ability to bloom, and your religious
 order has encouraged your study.
+
 Your religious superiors have forced
-you to learn weaponry as well,
-against your will.  You will find
+you to learn to use one handed weapons as well,
+against your will. You will find
 that they were wise to do so, but you
 haven't trained as assiduously as you
 should have, so you are soft and
 weak.
+
+This is a good class for beginning players.
 endmsg
 x 24
 y 6
@@ -2601,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
@@ -2615,7 +2747,7 @@
 arch grate_closed_1
 x 24
 y 8
-connected 1
+connected 9
 end
 arch grass
 x 24
@@ -2676,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
@@ -2760,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
@@ -2797,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
@@ -2810,19 +2933,23 @@
 y 6
 end
 arch sign
+name Warlock
 msg
-Warlock
-You've divided your time between
+You have divided your time between
 learning magic and learning weapons,
 but have totally disregarded
-religious devotion.  You're
-physically stronger and hardier
+religious devotion.
+
+You are physically stronger and hardier
 because of your training, and you
 know the use of weapons and bows.
+
 However, you're just a bit clumsy in
 both weaponry and magic because
 you've had to divide your time
 between them.
+
+This is a good class for beginning players.
 endmsg
 x 26
 y 6
@@ -2835,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
@@ -2849,7 +2976,7 @@
 arch grate_closed_1
 x 26
 y 8
-connected 1
+connected 10
 end
 arch grass
 x 26
@@ -2931,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
@@ -2987,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
@@ -3019,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
@@ -3032,29 +3172,36 @@
 y 6
 end
 arch sign
+name Evoker
 msg
-Evoker
 Your specialty is the use of attack
-spells in combat.  You practice these
+spells in combat. You practice these
 spells daily, and your capacity to
 cast them has increased hugely.
-You've had some training in weaponry
+
+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.
+
 You've never learned to use magic
 innately, but instead rely on a magic
 talisman to channel mana for you.
+
 The attack spells have imprinted
 themselves somewhat on your talisman,
 making it good for those and less
 useful for anything else.
+
 You have not been trained in
-religious devotion:  however, you
+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 28
 y 6
@@ -3067,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
@@ -3081,7 +3228,7 @@
 arch grate_closed_1
 x 28
 y 8
-connected 1
+connected 11
 end
 arch grass
 x 28
@@ -3149,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
@@ -3237,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
@@ -3250,19 +3405,28 @@
 y 6
 end
 arch sign
+name Wizard
 msg
-Wizard
-You're the generalist of the
-spellcasters.  You've emphasized the
-use of magic and studied all its
-areas equally.  You've learned
-something about the gods and
-religious devotion as well.  To a
-much lesser extent, you've studied
-weaponry, but you've not had much
-physical training:  you're mostly
+You are the generalist of the
+spellcasters. You've emphasized the
+use of magic. Due to studying all its
+areas almost equally, you have only basic knowledge
+about sorcery, although learning new skills and spells
+is an easy task for you.
+
+You've learned something about the gods
+and religious devotion as well.
+
+To a much lesser extent, you've studied
+the use of one handed weapons,
+but you've not had much
+physical training: you're mostly
 sedentary, and so you're not nearly
-so strong and healthy as you could be.
+as strong and healthy as you could be.
+
+This class is of intermediate difficulty, as Wizards need to acquire most of their attack spells and skills
+later in the game.
+
 endmsg
 x 30
 y 6
@@ -3275,12 +3439,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
@@ -3289,7 +3453,7 @@
 arch grate_closed_1
 x 30
 y 8
-connected 1
+connected 12
 end
 arch grass
 x 30
@@ -3363,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
@@ -3433,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
@@ -3465,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
@@ -3478,31 +3655,37 @@
 y 6
 end
 arch sign
+name Sorcerer
 msg
-Sorcerer
 Your study of magic has been
-obsessive.  Your frequent practice
+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.
+
 However, you've totally neglected to
 learn to use weaponry, and you're
-soft and weak.  Barbarians used to
+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
+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 resolved to learn how to
+friends, too. Fortunately, they ran
+off.
+
+You resolved to learn how to
 take out a whole group of barbarians
 before losing your temper again.
+
 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
 x 32
 y 6
@@ -3515,12 +3698,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
@@ -3529,7 +3712,7 @@
 arch grate_closed_1
 x 32
 y 8
-connected 1
+connected 13
 end
 arch grass
 x 32
@@ -3598,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
@@ -3686,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
@@ -3699,23 +3890,30 @@
 y 6
 end
 arch sign
+name Summoner
 msg
-Summoner
 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,
+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 work
-has leaned heavily toward the art of
+to channel mana for you.
+
+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,
+attuned to that. That attunement,
 however, makes it harder for you to
-reject unwanted creatures.  You've
-also had a reasonable education in
+reject unwanted creatures.
+
+You've also had a reasonable education in
 religious devotion.
+
+You can make use of one handed weapons, if need be.
+
+This is a relatively difficult class to play.
 endmsg
 x 34
 y 6
@@ -3728,12 +3926,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
@@ -3742,7 +3940,7 @@
 arch grate_closed_1
 x 34
 y 8
-connected 1
+connected 14
 end
 arch grass
 x 34
@@ -3811,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
@@ -3867,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
@@ -3899,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
@@ -3912,26 +4123,34 @@
 y 6
 end
 arch sign
+name Alchemist
 msg
-Alchemist
 Your specialty is magical devices and
 concoctions, but you've also had some
-training in weaponry, so that you can
+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, it's left little time for
+
+However, this has left little time for
 physical training, and your sedentary
-lifestyle has weakened you.
+lifestyle has weakened you very much.
+
 Your dependence on magical devices
 extends to the use of a talisman to
-channel mana.  The talisman has
+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 36
 y 6
@@ -3944,12 +4163,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
@@ -3958,7 +4177,7 @@
 arch grate_closed_1
 x 36
 y 8
-connected 1
+connected 15
 end
 arch grass
 x 36
@@ -4018,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
@@ -4102,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
@@ -4139,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
@@ -4168,26 +4381,45 @@
 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
-connected 1
 end
 arch button_small
 x 38
 y 8
-connected 1
+connected 16
 end
 arch grass
 x 38
@@ -4196,7 +4428,7 @@
 arch grate_closed_1
 x 38
 y 8
-connected 1
+connected 16
 end
 arch grass
 x 38
@@ -4275,6 +4507,10 @@
 x 39
 y 3
 end
+arch swall_1_3_half
+x 39
+y 3
+end
 arch grass
 x 39
 y 4