--- cf.schmorp.de/maps/start/tutorial_class.map	2008/12/17 20:21:31	1.9
+++ cf.schmorp.de/maps/start/tutorial_class.map	2009/04/05 20:46:32	1.14
@@ -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
@@ -80,9 +80,6 @@
 arch grass
 y 11
 end
-arch swall_1_4_half
-y 11
-end
 arch wall_2_1_1
 y 11
 end
@@ -160,10 +157,6 @@
 x 1
 y 11
 end
-arch swall_2_1_2
-x 1
-y 11
-end
 arch grass
 x 1
 y 12
@@ -238,10 +231,6 @@
 x 2
 y 11
 end
-arch swall_2_1_2
-x 2
-y 11
-end
 arch grass
 x 2
 y 12
@@ -339,7 +328,7 @@
 x 3
 y 11
 end
-arch swall_2_1_2
+arch swall_2_2_2
 x 3
 y 11
 end
@@ -347,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
@@ -457,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
@@ -3381,6 +3396,20 @@
 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
@@ -3520,20 +3549,6 @@
 x 31
 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 31
-y 4
-move_on all
-end
 arch grass
 x 31
 y 5
@@ -3640,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
@@ -3709,7 +3722,8 @@
 sp 12
 x 32
 y 9
-arch sorcerer_class
+carrying 70000
+arch pyromancer_class
 end
 end
 arch grass
@@ -3717,8 +3731,7 @@
 y 10
 move_block all
 end
-arch sorcerer_class
-face sorcerer.x51
+arch pyromancer_class
 x 32
 y 10
 end
@@ -3762,6 +3775,10 @@
 x 33
 y 2
 end
+arch grasspond
+x 33
+y 2
+end
 arch grass
 x 33
 y 3
@@ -3875,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
@@ -3937,7 +3961,7 @@
 sp 12
 x 34
 y 9
-arch summoner_class
+arch sorcerer_class
 end
 end
 arch grass
@@ -3945,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
@@ -4095,7 +4119,7 @@
 x 36
 y 3
 end
-arch footpath_1_3
+arch footpath_2_1_2
 x 36
 y 4
 end
@@ -4108,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
@@ -4174,7 +4194,7 @@
 sp 12
 x 36
 y 9
-arch alchemist_class
+arch summoner_class
 end
 end
 arch grass
@@ -4182,7 +4202,8 @@
 y 10
 move_block all
 end
-arch alchemist_class
+arch summoner_class
+face wizard_yellow.x51
 x 36
 y 10
 end
@@ -4198,7 +4219,7 @@
 x 36
 y 12
 end
-arch footpath_1_3
+arch footpath_2_1_2
 x 36
 y 13
 end
@@ -4234,7 +4255,7 @@
 x 37
 y 3
 end
-arch grass
+arch footpath_2_1_2
 x 37
 y 4
 end
@@ -4242,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
@@ -4298,7 +4311,7 @@
 x 37
 y 12
 end
-arch grass
+arch footpath_2_1_2
 x 37
 y 13
 end
@@ -4334,8 +4347,252 @@
 x 38
 y 3
 end
+arch footpath_2_1_2
+x 38
+y 4
+end
 arch grass
 x 38
+y 5
+end
+arch grass
+x 38
+y 6
+end
+arch sign
+name Alchemist
+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.
+
+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
+move_on all
+end
+arch grass
+x 38
+y 7
+end
+arch button_small
+x 38
+y 7
+connected 16
+end
+arch button_small
+x 38
+y 8
+connected 16
+end
+arch grass
+x 38
+y 8
+end
+arch grate_closed_1
+x 38
+y 8
+connected 16
+end
+arch grass
+x 38
+y 9
+end
+arch player_changer
+slaying /start/tutorial_class
+hp 38
+sp 12
+x 38
+y 9
+arch alchemist_class
+end
+end
+arch grass
+x 38
+y 10
+move_block all
+end
+arch alchemist_class
+x 38
+y 10
+end
+arch grass
+x 38
+y 11
+end
+arch swall_2_1_2
+x 38
+y 11
+end
+arch grass
+x 38
+y 12
+end
+arch footpath_2_1_2
+x 38
+y 13
+end
+arch grass
+x 38
+y 14
+end
+arch grass
+x 38
+y 15
+end
+arch wall_2_1_2
+x 38
+y 15
+end
+arch evergreen
+x 39
+move_block all
+end
+arch grass
+x 39
+y 1
+end
+arch grass
+x 39
+y 2
+end
+arch grass
+x 39
+y 3
+end
+arch swall_2_1_2
+x 39
+y 3
+end
+arch footpath_1_3
+x 39
+y 4
+end
+arch grass
+x 39
+y 5
+end
+arch swall_1_1
+x 39
+y 5
+end
+arch grass
+x 39
+y 6
+end
+arch swall_2_1_1
+x 39
+y 6
+end
+arch grass
+x 39
+y 7
+end
+arch swall_2_1_1
+x 39
+y 7
+end
+arch grass
+x 39
+y 8
+end
+arch swall_2_1_1
+x 39
+y 8
+end
+arch grass
+x 39
+y 9
+end
+arch swall_2_1_1
+x 39
+y 9
+end
+arch grass
+x 39
+y 10
+end
+arch swall_2_1_1
+x 39
+y 10
+end
+arch grass
+x 39
+y 11
+end
+arch swall_3_1
+x 39
+y 11
+end
+arch grass
+x 39
+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
@@ -4351,16 +4608,16 @@
 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
+x 40
 y 4
 move_on all
 end
 arch grass
-x 38
+x 40
 y 5
 end
 arch grass
-x 38
+x 40
 y 6
 end
 arch sign
@@ -4372,7 +4629,7 @@
 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
+x 40
 y 6
 move_on all
 end
@@ -4385,214 +4642,215 @@
 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
+x 40
 y 7
+connected 17
 end
 arch magic_ear
 msg
 @match I know
 Ok, you wanted it that way!
 endmsg
-x 38
+x 40
 y 7
-connected 16
+connected 17
 end
 arch grass
-x 38
+x 40
 y 7
 end
 arch button_small
-x 38
+x 40
 y 8
-connected 16
+connected 17
 end
 arch grass
-x 38
+x 40
 y 8
 end
 arch grate_closed_1
-x 38
+x 40
 y 8
-connected 16
+connected 17
 end
 arch grass
-x 38
+x 40
 y 9
 end
 arch exit
 slaying /start/tutorial_class
-hp 38
+hp 40
 sp 12
-x 38
+x 40
 y 9
 damned 1
 end
 arch grass
-x 38
+x 40
 y 10
 move_block all
 end
 arch minesweeper-unknown
-x 38
+x 40
 y 10
 end
 arch grass
-x 38
+x 40
 y 11
 end
 arch swall_2_1_2
-x 38
+x 40
 y 11
 end
 arch grass
-x 38
+x 40
 y 12
 end
-arch grass
-x 38
+arch footpath_1_3
+x 40
 y 13
 end
 arch grass
-x 38
+x 40
 y 14
 end
 arch grass
-x 38
+x 40
 y 15
 end
 arch wall_2_1_2
-x 38
+x 40
 y 15
 end
 arch evergreen
-x 39
+x 41
 move_block all
 end
 arch grass
-x 39
+x 41
 y 1
 end
 arch wall_1_1
-x 39
+x 41
 y 1
 end
 arch grass
-x 39
+x 41
 y 2
 end
 arch wall_2_1_1
-x 39
+x 41
 y 2
 end
 arch grass
-x 39
+x 41
 y 3
 end
 arch wall_2_1_1
-x 39
+x 41
 y 3
 end
 arch swall_1_3_half
-x 39
+x 41
 y 3
 end
 arch grass
-x 39
+x 41
 y 4
 end
 arch wall_2_1_1
-x 39
+x 41
 y 4
 end
 arch grass
-x 39
+x 41
 y 5
 end
 arch wall_2_1_1
-x 39
+x 41
 y 5
 end
 arch grass
-x 39
+x 41
 y 6
 end
 arch wall_2_1_1
-x 39
+x 41
 y 6
 end
 arch grass
-x 39
+x 41
 y 7
 end
 arch wall_2_1_1
-x 39
+x 41
 y 7
 end
 arch grass
-x 39
+x 41
 y 8
 end
 arch wall_2_1_1
-x 39
+x 41
 y 8
 end
 arch grass
-x 39
+x 41
 y 9
 end
 arch wall_2_1_1
-x 39
+x 41
 y 9
 end
 arch grass
-x 39
+x 41
 y 10
 end
 arch wall_2_1_1
-x 39
+x 41
 y 10
 end
 arch grass
-x 39
+x 41
 y 11
 end
 arch wall_2_1_1
-x 39
+x 41
 y 11
 end
 arch swall_1_3_half
-x 39
+x 41
 y 11
 end
 arch grass
-x 39
+x 41
 y 12
 end
 arch wall_2_1_1
-x 39
+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