--- cf.schmorp.de/maps/start/tutorial_part3.map	2008/04/09 14:35:32	1.7
+++ cf.schmorp.de/maps/start/tutorial_part3.map	2017/08/22 02:37:46	1.20
@@ -40,12 +40,12 @@
 arch wall_1_2
 y 5
 end
-arch woodfloor
+arch woodfloor2
 y 6
 end
 arch exit
 slaying tutorial_part2
-hp 20
+hp 19
 sp 19
 y 6
 end
@@ -97,49 +97,49 @@
 arch wall_2_2_1
 y 14
 end
-arch woodfloor
+arch evergreen
 y 15
 end
-arch woodfloor
+arch evergreen
 y 16
 end
-arch woodfloor
+arch evergreen
 y 17
 end
-arch woodfloor
+arch evergreen
 y 18
 end
-arch woodfloor
+arch evergreen
 y 19
 end
-arch woodfloor
+arch evergreen
 y 20
 end
-arch woodfloor
+arch evergreen
 y 21
 end
-arch woodfloor
+arch evergreen
 y 22
 end
-arch woodfloor
+arch evergreen
 y 23
 end
-arch woodfloor
+arch evergreen
 y 24
 end
-arch woodfloor
+arch evergreen
 y 25
 end
-arch woodfloor
+arch evergreen
 y 26
 end
-arch woodfloor
+arch evergreen
 y 27
 end
-arch woodfloor
+arch evergreen
 y 28
 end
-arch woodfloor
+arch evergreen
 y 29
 end
 arch woodfloor
@@ -168,7 +168,7 @@
 x 1
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 1
 y 6
 end
@@ -208,67 +208,75 @@
 x 1
 y 14
 end
-arch wall_2_1_2
+arch window_win2
 x 1
 y 14
 end
-arch woodfloor
+arch grass
 x 1
 y 15
 end
-arch woodfloor
+arch grass
 x 1
 y 16
 end
-arch woodfloor
+arch grass
 x 1
 y 17
 end
-arch woodfloor
+arch bird
+x 1
+y 17
+end
+arch grasspond
 x 1
 y 18
 end
-arch woodfloor
+arch grasspond
 x 1
 y 19
 end
-arch woodfloor
+arch grass
 x 1
 y 20
 end
-arch woodfloor
+arch grass
 x 1
 y 21
 end
-arch woodfloor
+arch flowers_permanent
+x 1
+y 21
+end
+arch evergreen
 x 1
 y 22
 end
-arch woodfloor
+arch evergreen
 x 1
 y 23
 end
-arch woodfloor
+arch grasspond
 x 1
 y 24
 end
-arch woodfloor
+arch grass
 x 1
 y 25
 end
-arch woodfloor
+arch grasspond
 x 1
 y 26
 end
-arch woodfloor
+arch grasspond
 x 1
 y 27
 end
-arch woodfloor
+arch grass
 x 1
 y 28
 end
-arch woodfloor
+arch evergreen
 x 1
 y 29
 end
@@ -282,32 +290,38 @@
 x 2
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 4
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 2
 y 6
 end
 arch sign
-name Missile Weapons
+name Missile Weapons and Cults
 msg
-If you happen to have a bow or crossbow in your inventory
-(or other ranged weapons such as rods, staffs or area spells such as burning hands),
-go south for ranged attacks training. If you do not, go north.
+Welcome to the third and last part of the tutorial!
+
+If you happen to have a B<bow> or B<crossbow> in your inventory
+(or other ranged weapons such as B<rods>, B<staffs> or B<area spells> such as burning hands),
+go south for ranged attacks training. If you do not, continue north.
+
+If you have the praying skill or a holy symbol in your inventory, or
+otherwise want to learn about cults and worshipping gods,
+please go to the southeast room. If you do not, continue north.
 endmsg
 x 2
 y 6
@@ -335,10 +349,11 @@
 arch sign
 name Missile Weapon Training
 msg
-Ready your bow, crossbow or rod by clicking on it. Arrows or bolts in your inventory will be used automatically.
+Ready your bow, crossbow or rod by (middle) clicking on it in the inventory.
+Arrows or bolts in your inventory will be used automatically.
 
 If you want to use a spell you learned (you might check your inventory for any spellbooks and read them
-by applying them), use the B<cast name of spell> command, as in B<cast burning hands> or simply
+by applying them (middle click for apply)), use the B<cast name of spell> command, as in B<cast burning hands> or simply
 B<cbh>, which will put the spell into your range slots, just as with a bow or crossbow.
 
 To fire a missile weapon (or in general make a ranged attack), hold down your B<Shift> key (the "fire" key),
@@ -366,67 +381,71 @@
 x 2
 y 14
 end
-arch wall_2_1_2
+arch window_win2
 x 2
 y 14
 end
-arch woodfloor
+arch evergreen
 x 2
 y 15
 end
-arch woodfloor
+arch evergreen
 x 2
 y 16
 end
-arch woodfloor
+arch evergreen
 x 2
 y 17
 end
-arch woodfloor
+arch grass
 x 2
 y 18
 end
-arch woodfloor
+arch grass
 x 2
 y 19
 end
-arch woodfloor
+arch flowers_permanent
+x 2
+y 19
+end
+arch evergreen
 x 2
 y 20
 end
-arch woodfloor
+arch grass
 x 2
 y 21
 end
-arch woodfloor
+arch evergreen
 x 2
 y 22
 end
-arch woodfloor
+arch grass
 x 2
 y 23
 end
-arch woodfloor
+arch evergreen
 x 2
 y 24
 end
-arch woodfloor
+arch grass
 x 2
 y 25
 end
-arch woodfloor
+arch evergreen
 x 2
 y 26
 end
-arch woodfloor
+arch evergreen
 x 2
 y 27
 end
-arch woodfloor
+arch grass
 x 2
 y 28
 end
-arch woodfloor
+arch evergreen
 x 2
 y 29
 end
@@ -440,7 +459,7 @@
 x 3
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 3
 y 2
 end
@@ -512,7 +531,7 @@
 x 3
 y 16
 end
-arch wall_2_1_1
+arch window_win1
 x 3
 y 16
 end
@@ -532,47 +551,63 @@
 x 3
 y 18
 end
-arch woodfloor
+arch grass
 x 3
 y 19
 end
-arch woodfloor
+arch flowers_permanent
+x 3
+y 19
+end
+arch grass
 x 3
 y 20
 end
-arch woodfloor
+arch bee
+x 3
+y 20
+end
+arch grass
 x 3
 y 21
 end
-arch woodfloor
+arch bird
+x 3
+y 21
+end
+arch grass
 x 3
 y 22
 end
-arch woodfloor
+arch grass
 x 3
 y 23
 end
-arch woodfloor
+arch bee
+x 3
+y 23
+end
+arch evergreen
 x 3
 y 24
 end
-arch woodfloor
+arch evergreen
 x 3
 y 25
 end
-arch woodfloor
+arch evergreen
 x 3
 y 26
 end
-arch woodfloor
+arch grasspond
 x 3
 y 27
 end
-arch woodfloor
+arch grass
 x 3
 y 28
 end
-arch woodfloor
+arch evergreen
 x 3
 y 29
 end
@@ -586,7 +621,7 @@
 x 4
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 2
 end
@@ -622,7 +657,7 @@
 x 4
 y 7
 end
-arch wall_3_2
+arch wall_2_2_1
 x 4
 y 7
 end
@@ -630,15 +665,11 @@
 x 4
 y 8
 end
-arch wall_2_1_1
-x 4
-y 8
-end
 arch woodfloor
 x 4
 y 9
 end
-arch wall_3_1
+arch wall_2_1_2
 x 4
 y 9
 end
@@ -675,9 +706,10 @@
 x 4
 y 15
 end
-arch goldcoin
+arch silvercoin
 x 4
 y 15
+nrof 50
 end
 arch woodfloor
 x 4
@@ -695,47 +727,63 @@
 x 4
 y 18
 end
-arch woodfloor
+arch grass
 x 4
 y 19
 end
-arch woodfloor
+arch evergreen
 x 4
 y 20
 end
-arch woodfloor
+arch evergreen
 x 4
 y 21
 end
-arch woodfloor
+arch evergreen
 x 4
 y 22
 end
-arch woodfloor
+arch grass
 x 4
 y 23
 end
-arch woodfloor
+arch flowers_permanent
+x 4
+y 23
+end
+arch grass
 x 4
 y 24
 end
-arch woodfloor
+arch flowers_permanent
+x 4
+y 24
+end
+arch grass
 x 4
 y 25
 end
-arch woodfloor
+arch flowers_permanent
+x 4
+y 25
+end
+arch grass
 x 4
 y 26
 end
-arch woodfloor
+arch grasspond
 x 4
 y 27
 end
-arch woodfloor
+arch grass
 x 4
 y 28
 end
-arch woodfloor
+arch bird
+x 4
+y 28
+end
+arch evergreen
 x 4
 y 29
 end
@@ -749,7 +797,7 @@
 x 5
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 5
 y 2
 end
@@ -854,51 +902,51 @@
 x 5
 y 18
 end
-arch wall_2_1_2
+arch window_win2
 x 5
 y 18
 end
-arch woodfloor
+arch evergreen
 x 5
 y 19
 end
-arch woodfloor
+arch evergreen
 x 5
 y 20
 end
-arch woodfloor
+arch grasspond
 x 5
 y 21
 end
-arch woodfloor
+arch grass
 x 5
 y 22
 end
-arch woodfloor
+arch grass
 x 5
 y 23
 end
-arch woodfloor
+arch evergreen
 x 5
 y 24
 end
-arch woodfloor
+arch evergreen
 x 5
 y 25
 end
-arch woodfloor
+arch evergreen
 x 5
 y 26
 end
-arch woodfloor
+arch evergreen
 x 5
 y 27
 end
-arch woodfloor
+arch evergreen
 x 5
 y 28
 end
-arch woodfloor
+arch evergreen
 x 5
 y 29
 end
@@ -912,7 +960,7 @@
 x 6
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 6
 y 2
 end
@@ -922,11 +970,12 @@
 end
 arch rune_mark
 msg
-=== Altars ===
+T<Altars>
 
-Altars have many different uses.  Some altars are consecrated to a particular god.
-Do not pray over these altars unless you wish to worship that god! (More on gods later).
-Altars can also cast spells and perform other actions if you place the correct sacrifice on them.
+Altars have many different uses.
+Altars can cast spells and perform other actions if you place the correct sacrifice on them.
+They may also be consecrated to a god. You can learn
+about this by going back to the sign and going southwest.
 
 The altar to your south is an I<altar of detect magic>. Dropping money on it will cause it to cast
 detect magic on all the items in your inventory.  (Make sure you pick up your change). 
@@ -1029,51 +1078,59 @@
 x 6
 y 18
 end
-arch wall_2_1_2
+arch window_win2
 x 6
 y 18
 end
-arch woodfloor
+arch grass
 x 6
 y 19
 end
-arch woodfloor
+arch flowers_permanent
+x 6
+y 19
+end
+arch evergreen
 x 6
 y 20
 end
-arch woodfloor
+arch evergreen
 x 6
 y 21
 end
-arch woodfloor
+arch evergreen
 x 6
 y 22
 end
-arch woodfloor
+arch grass
 x 6
 y 23
 end
-arch woodfloor
+arch flowers_permanent
+x 6
+y 23
+end
+arch grass
 x 6
 y 24
 end
-arch woodfloor
+arch evergreen
 x 6
 y 25
 end
-arch woodfloor
+arch grass
 x 6
 y 26
 end
-arch woodfloor
+arch grass
 x 6
 y 27
 end
-arch woodfloor
+arch grass
 x 6
 y 28
 end
-arch woodfloor
+arch evergreen
 x 6
 y 29
 end
@@ -1087,7 +1144,7 @@
 x 7
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 7
 y 2
 end
@@ -1119,6 +1176,37 @@
 x 7
 y 8
 end
+arch rune_mark
+msg
+T<Divine Altars>
+
+Divine Altars are unlike the altars you will learn about later.
+Most of them are consecrated to one of the 10 gods of
+Deliantra. If you use the B<ready_skill praying> command
+(by default this is bound to Alt-P) and hold your B<Shift>
+key down and use an arrow key, you will pray. Do this over
+a consecrated altar, and you will join the god the altar is
+consecrated to.
+
+Worshipping a god will affect your character in many ways.
+You will have the opportunity to learn about this in B<Scorn>,
+which has an area for mostly every god.
+
+Be warned, once you join a cult it is a little tricky to leave.
+If you pray over an altar that isn't consecrated to your god,
+you will be pushed off and have reduced prayer experience.
+You can use the B<brace> command to prevent yourself from
+being pushed off, and gain godpower resistance to prevent some
+experience from being lost.
+
+Gray un-adorned altars are not consecrated. They do not
+belong to any cult. Praying over them is like praying over
+any other tile, but high level players can use the
+B<consecrate> spell to align the altar to their god.
+endmsg
+x 7
+y 8
+end
 arch woodfloor
 x 7
 y 9
@@ -1191,47 +1279,63 @@
 x 7
 y 18
 end
-arch woodfloor
+arch grass
 x 7
 y 19
 end
-arch woodfloor
+arch flowers_permanent
+x 7
+y 19
+end
+arch grass
 x 7
 y 20
 end
-arch woodfloor
+arch grass
 x 7
 y 21
 end
-arch woodfloor
+arch grass
 x 7
 y 22
 end
-arch woodfloor
+arch grass
 x 7
 y 23
 end
-arch woodfloor
+arch flowers_permanent
+x 7
+y 23
+end
+arch grass
 x 7
 y 24
 end
-arch woodfloor
+arch flowers_permanent
+x 7
+y 24
+end
+arch grass
 x 7
 y 25
 end
-arch woodfloor
+arch evergreen
 x 7
 y 26
 end
-arch woodfloor
+arch evergreen
 x 7
 y 27
 end
-arch woodfloor
+arch grass
 x 7
 y 28
 end
-arch woodfloor
+arch bird
+x 7
+y 28
+end
+arch evergreen
 x 7
 y 29
 end
@@ -1245,7 +1349,7 @@
 x 8
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 2
 end
@@ -1395,7 +1499,7 @@
 x 8
 y 20
 end
-arch wall_2_1_1
+arch window_win1
 x 8
 y 20
 end
@@ -1411,7 +1515,7 @@
 x 8
 y 22
 end
-arch wall_2_1_1
+arch window_win1
 x 8
 y 22
 end
@@ -1431,23 +1535,23 @@
 x 8
 y 24
 end
-arch woodfloor
+arch grass
 x 8
 y 25
 end
-arch woodfloor
+arch evergreen
 x 8
 y 26
 end
-arch woodfloor
+arch evergreen
 x 8
 y 27
 end
-arch woodfloor
+arch grass
 x 8
 y 28
 end
-arch woodfloor
+arch evergreen
 x 8
 y 29
 end
@@ -1461,7 +1565,7 @@
 x 9
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 2
 end
@@ -1589,23 +1693,27 @@
 x 9
 y 24
 end
-arch woodfloor
+arch grass
 x 9
 y 25
 end
-arch woodfloor
+arch flowers_permanent
+x 9
+y 25
+end
+arch grasspond
 x 9
 y 26
 end
-arch woodfloor
+arch evergreen
 x 9
 y 27
 end
-arch woodfloor
+arch grass
 x 9
 y 28
 end
-arch woodfloor
+arch evergreen
 x 9
 y 29
 end
@@ -1619,7 +1727,7 @@
 x 10
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 2
 end
@@ -1629,6 +1737,8 @@
 end
 arch rune_mark
 msg
+T<Detect Curse>
+
 This altar to your south is a I<detect curse> altar.
 It works the same as the I<detect magic> altar below.
 Altars like these are often found in shops in towns.  
@@ -1671,7 +1781,7 @@
 x 10
 y 8
 end
-arch wall_0
+arch altar_none
 x 10
 y 8
 end
@@ -1727,7 +1837,7 @@
 x 10
 y 15
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 16
 end
@@ -1738,24 +1848,24 @@
 If not killed quickly, these monsters can spread to fill up a map completely.
 Run through this door and kill the mice inside before they get out of control (to be honest, we cheated
 and tried our best to keep them from spreading throughout the whole map, but once
-outside int he harsh world, you will not be as lucky).
+outside in the harsh world, you will not be as lucky).
 endmsg
 x 10
 y 16
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 17
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 18
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 20
 end
@@ -1784,38 +1894,39 @@
 x 10
 y 23
 end
-arch scroll_new
-sp 76
+arch potion_heal
 x 10
 y 23
-level 1
-identified 1
 end
 arch woodfloor
 x 10
 y 24
 end
-arch wall_2_1_2
+arch window_win2
 x 10
 y 24
 end
-arch woodfloor
+arch grass
 x 10
 y 25
 end
-arch woodfloor
+arch flowers_permanent
+x 10
+y 25
+end
+arch grass
 x 10
 y 26
 end
-arch woodfloor
+arch evergreen
 x 10
 y 27
 end
-arch woodfloor
+arch grass
 x 10
 y 28
 end
-arch woodfloor
+arch evergreen
 x 10
 y 29
 end
@@ -1829,7 +1940,7 @@
 x 11
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 2
 end
@@ -1917,7 +2028,7 @@
 x 11
 y 15
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 16
 end
@@ -1937,7 +2048,7 @@
 x 11
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 20
 end
@@ -1961,23 +2072,31 @@
 x 11
 y 24
 end
-arch woodfloor
+arch grass
 x 11
 y 25
 end
-arch woodfloor
+arch evergreen
 x 11
 y 26
 end
-arch woodfloor
+arch grass
 x 11
 y 27
 end
-arch woodfloor
+arch flowers_permanent
+x 11
+y 27
+end
+arch grass
 x 11
 y 28
 end
-arch woodfloor
+arch flowers_permanent
+x 11
+y 28
+end
+arch evergreen
 x 11
 y 29
 end
@@ -1991,7 +2110,7 @@
 x 12
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 2
 end
@@ -2063,15 +2182,15 @@
 x 12
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 15
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 16
 end
@@ -2091,7 +2210,7 @@
 x 12
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 20
 end
@@ -2127,23 +2246,31 @@
 x 12
 y 24
 end
-arch woodfloor
+arch grass
 x 12
 y 25
 end
-arch woodfloor
+arch bird
+x 12
+y 25
+end
+arch evergreen
 x 12
 y 26
 end
-arch woodfloor
+arch evergreen
 x 12
 y 27
 end
-arch woodfloor
+arch grass
 x 12
 y 28
 end
-arch woodfloor
+arch bee
+x 12
+y 28
+end
+arch evergreen
 x 12
 y 29
 end
@@ -2157,7 +2284,7 @@
 x 13
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 2
 end
@@ -2217,7 +2344,7 @@
 x 13
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 14
 end
@@ -2249,7 +2376,7 @@
 x 13
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 20
 end
@@ -2273,23 +2400,23 @@
 x 13
 y 24
 end
-arch woodfloor
+arch grass
 x 13
 y 25
 end
-arch woodfloor
+arch grass
 x 13
 y 26
 end
-arch woodfloor
+arch evergreen
 x 13
 y 27
 end
-arch woodfloor
+arch grass
 x 13
 y 28
 end
-arch woodfloor
+arch evergreen
 x 13
 y 29
 end
@@ -2303,7 +2430,7 @@
 x 14
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 2
 end
@@ -2313,6 +2440,8 @@
 end
 arch rune_mark
 msg
+T<Tables>
+
 Tables work much like altars. The table to the
 east is an I<identify item> table. It will identify the
 unidentified items in your inventory, one at a time, for 20
@@ -2335,8 +2464,7 @@
 y 6
 end
 arch identify_table
-name item identify tablein your inventory.
-food 0
+name item identify table (identifies one or more items in your inventory)
 x 14
 y 6
 end
@@ -2380,7 +2508,7 @@
 x 14
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 14
 end
@@ -2420,7 +2548,7 @@
 x 14
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 20
 end
@@ -2447,35 +2575,42 @@
 x 14
 y 23
 end
-arch potion_heal
+arch scroll_new
+sp 76
 x 14
 y 23
+level 1
+identified 1
 end
 arch woodfloor
 x 14
 y 24
 end
-arch wall_2_1_2
+arch window_win2
 x 14
 y 24
 end
-arch woodfloor
+arch grass
 x 14
 y 25
 end
-arch woodfloor
+arch flowers_permanent
+x 14
+y 25
+end
+arch evergreen
 x 14
 y 26
 end
-arch woodfloor
+arch evergreen
 x 14
 y 27
 end
-arch woodfloor
+arch grass
 x 14
 y 28
 end
-arch woodfloor
+arch evergreen
 x 14
 y 29
 end
@@ -2489,7 +2624,7 @@
 x 15
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 2
 end
@@ -2553,7 +2688,7 @@
 x 15
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 14
 end
@@ -2593,7 +2728,7 @@
 x 15
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 20
 end
@@ -2617,23 +2752,27 @@
 x 15
 y 24
 end
-arch woodfloor
+arch grass
 x 15
 y 25
 end
-arch woodfloor
+arch bee
+x 15
+y 25
+end
+arch grasspond
 x 15
 y 26
 end
-arch woodfloor
+arch evergreen
 x 15
 y 27
 end
-arch woodfloor
+arch grass
 x 15
 y 28
 end
-arch woodfloor
+arch evergreen
 x 15
 y 29
 end
@@ -2647,7 +2786,7 @@
 x 16
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 2
 end
@@ -2731,7 +2870,7 @@
 x 16
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 14
 end
@@ -2771,7 +2910,7 @@
 x 16
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 20
 end
@@ -2807,23 +2946,31 @@
 x 16
 y 24
 end
-arch woodfloor
+arch grass
 x 16
 y 25
 end
-arch woodfloor
+arch flowers_permanent
+x 16
+y 25
+end
+arch evergreen
 x 16
 y 26
 end
-arch woodfloor
+arch evergreen
 x 16
 y 27
 end
-arch woodfloor
+arch grass
 x 16
 y 28
 end
-arch woodfloor
+arch bird
+x 16
+y 28
+end
+arch evergreen
 x 16
 y 29
 end
@@ -2837,7 +2984,7 @@
 x 17
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 2
 end
@@ -2893,7 +3040,7 @@
 x 17
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 14
 end
@@ -2925,7 +3072,7 @@
 x 17
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 20
 end
@@ -2953,23 +3100,23 @@
 x 17
 y 24
 end
-arch woodfloor
+arch grass
 x 17
 y 25
 end
-arch woodfloor
+arch evergreen
 x 17
 y 26
 end
-arch woodfloor
+arch grasspond
 x 17
 y 27
 end
-arch woodfloor
+arch grass
 x 17
 y 28
 end
-arch woodfloor
+arch evergreen
 x 17
 y 29
 end
@@ -2983,7 +3130,7 @@
 x 18
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 2
 end
@@ -3031,7 +3178,7 @@
 x 18
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 14
 end
@@ -3073,7 +3220,7 @@
 x 18
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 20
 end
@@ -3112,27 +3259,31 @@
 x 18
 y 24
 end
-arch wall_2_1_2
+arch window_win2
 x 18
 y 24
 end
-arch woodfloor
+arch grass
 x 18
 y 25
 end
-arch woodfloor
+arch evergreen
 x 18
 y 26
 end
-arch woodfloor
+arch grass
 x 18
 y 27
 end
-arch woodfloor
+arch grass
 x 18
 y 28
 end
-arch woodfloor
+arch flowers_permanent
+x 18
+y 28
+end
+arch evergreen
 x 18
 y 29
 end
@@ -3146,39 +3297,39 @@
 x 19
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 4
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 8
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 10
 end
@@ -3209,19 +3360,19 @@
 x 19
 y 10
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 11
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 12
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 14
 end
@@ -3253,7 +3404,7 @@
 x 19
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 20
 end
@@ -3281,23 +3432,35 @@
 x 19
 y 24
 end
-arch woodfloor
+arch grass
 x 19
 y 25
 end
-arch woodfloor
+arch grass
 x 19
 y 26
 end
-arch woodfloor
+arch bird
+x 19
+y 26
+end
+arch grass
 x 19
 y 27
 end
-arch woodfloor
+arch bird
+x 19
+y 27
+end
+arch grass
 x 19
 y 28
 end
-arch woodfloor
+arch flowers_permanent
+x 19
+y 28
+end
+arch evergreen
 x 19
 y 29
 end
@@ -3387,7 +3550,7 @@
 x 20
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 20
 y 20
 end
@@ -3435,7 +3598,7 @@
 x 20
 y 26
 end
-arch wall_2_1_1
+arch window_win1
 x 20
 y 26
 end
@@ -3455,7 +3618,7 @@
 x 20
 y 28
 end
-arch woodfloor
+arch evergreen
 x 20
 y 29
 end
@@ -3477,7 +3640,7 @@
 x 21
 y 2
 end
-arch wall_2_1_1
+arch window_win1
 x 21
 y 2
 end
@@ -3517,7 +3680,7 @@
 x 21
 y 7
 end
-arch wall_2_1_1
+arch window_win1
 x 21
 y 7
 end
@@ -3557,7 +3720,7 @@
 x 21
 y 12
 end
-arch wall_2_1_1
+arch window_win1
 x 21
 y 12
 end
@@ -3613,7 +3776,7 @@
 x 21
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 21
 y 20
 end
@@ -3658,78 +3821,90 @@
 x 21
 y 28
 end
-arch woodfloor
+arch evergreen
 x 21
 y 29
 end
-arch woodfloor
+arch evergreen
 x 22
 end
-arch woodfloor
+arch grass
 x 22
 y 1
 end
-arch woodfloor
+arch grass
 x 22
 y 2
 end
-arch woodfloor
+arch flowers_permanent
+x 22
+y 2
+end
+arch evergreen
 x 22
 y 3
 end
-arch woodfloor
+arch grass
 x 22
 y 4
 end
-arch woodfloor
+arch grass
 x 22
 y 5
 end
-arch woodfloor
+arch flowers_permanent
+x 22
+y 5
+end
+arch grass
 x 22
 y 6
 end
-arch woodfloor
+arch grass
 x 22
 y 7
 end
-arch woodfloor
+arch grass
 x 22
 y 8
 end
-arch woodfloor
+arch evergreen
 x 22
 y 9
 end
-arch woodfloor
+arch grass
 x 22
 y 10
 end
-arch woodfloor
+arch grass
 x 22
 y 11
 end
-arch woodfloor
+arch grass
 x 22
 y 12
 end
-arch woodfloor
+arch flowers_permanent
+x 22
+y 12
+end
+arch grass
 x 22
 y 13
 end
-arch woodfloor
+arch grass
 x 22
 y 14
 end
-arch woodfloor
+arch evergreen
 x 22
 y 15
 end
-arch woodfloor
+arch grass
 x 22
 y 16
 end
-arch woodfloor
+arch grass
 x 22
 y 17
 end
@@ -3737,7 +3912,7 @@
 x 22
 y 18
 end
-arch wall_2_1_2
+arch window_win2
 x 22
 y 18
 end
@@ -3745,26 +3920,26 @@
 x 22
 y 19
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 20
 end
 arch sign
 name Congratulations
 msg
-Congratulations, you have completed this part of the tutorial!
-Take the exit to your south to move on.
-Step carefully around the gravestone of Harold,
+Congratulations, you have completed the tutorial now!
+
+Take the exit to your south to move on, but step carefully around the gravestone of Harold,
 who didn't pay very close attention and paid the price. :-)
 endmsg
 x 22
 y 20
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 21
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 22
 end
@@ -3775,7 +3950,7 @@
 x 22
 y 22
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 23
 end
@@ -3784,7 +3959,7 @@
 y 23
 connected 9
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 24
 end
@@ -3793,25 +3968,23 @@
 y 24
 connected 9
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 25
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 26
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 27
 end
 arch exit
-slaying /scorn/misc/beginners
+slaying *start_tutorial_exit
 msg
 Good luck!
 endmsg
-hp 15
-sp 28
 x 22
 y 27
 damned 1
@@ -3824,78 +3997,102 @@
 x 22
 y 28
 end
-arch woodfloor
+arch evergreen
 x 22
 y 29
 end
-arch woodfloor
+arch evergreen
 x 23
 end
-arch woodfloor
+arch grass
 x 23
 y 1
 end
-arch woodfloor
+arch bird
+x 23
+y 1
+end
+arch grasspond
 x 23
 y 2
 end
-arch woodfloor
+arch grass
 x 23
 y 3
 end
-arch woodfloor
+arch grass
 x 23
 y 4
 end
-arch woodfloor
+arch flowers_permanent
+x 23
+y 4
+end
+arch grass
 x 23
 y 5
 end
-arch woodfloor
+arch flowers_permanent
+x 23
+y 5
+end
+arch evergreen
 x 23
 y 6
 end
-arch woodfloor
+arch grass
 x 23
 y 7
 end
-arch woodfloor
+arch bird
+x 23
+y 7
+end
+arch grass
 x 23
 y 8
 end
-arch woodfloor
+arch grasspond
 x 23
 y 9
 end
-arch woodfloor
+arch evergreen
 x 23
 y 10
 end
-arch woodfloor
+arch grasspond
 x 23
 y 11
 end
-arch woodfloor
+arch grass
 x 23
 y 12
 end
-arch woodfloor
+arch flowers_permanent
+x 23
+y 12
+end
+arch grass
 x 23
 y 13
 end
-arch woodfloor
+arch bird
+x 23
+y 13
+end
+arch evergreen
 x 23
 y 14
 end
-arch woodfloor
+arch grass
 x 23
 y 15
 end
-arch woodfloor
+arch grasspond
 x 23
 y 16
 end
-arch woodfloor
+arch grass
 x 23
 y 17
 end
@@ -3903,7 +4100,7 @@
 x 23
 y 18
 end
-arch wall_2_1_2
+arch window_win2
 x 23
 y 18
 end
@@ -3956,78 +4153,78 @@
 x 23
 y 28
 end
-arch woodfloor
+arch evergreen
 x 23
 y 29
 end
-arch woodfloor
+arch evergreen
 x 24
 end
-arch woodfloor
+arch evergreen
 x 24
 y 1
 end
-arch woodfloor
+arch evergreen
 x 24
 y 2
 end
-arch woodfloor
+arch evergreen
 x 24
 y 3
 end
-arch woodfloor
+arch evergreen
 x 24
 y 4
 end
-arch woodfloor
+arch evergreen
 x 24
 y 5
 end
-arch woodfloor
+arch evergreen
 x 24
 y 6
 end
-arch woodfloor
+arch evergreen
 x 24
 y 7
 end
-arch woodfloor
+arch evergreen
 x 24
 y 8
 end
-arch woodfloor
+arch evergreen
 x 24
 y 9
 end
-arch woodfloor
+arch evergreen
 x 24
 y 10
 end
-arch woodfloor
+arch evergreen
 x 24
 y 11
 end
-arch woodfloor
+arch evergreen
 x 24
 y 12
 end
-arch woodfloor
+arch evergreen
 x 24
 y 13
 end
-arch woodfloor
+arch evergreen
 x 24
 y 14
 end
-arch woodfloor
+arch evergreen
 x 24
 y 15
 end
-arch woodfloor
+arch evergreen
 x 24
 y 16
 end
-arch woodfloor
+arch evergreen
 x 24
 y 17
 end
@@ -4119,7 +4316,7 @@
 x 24
 y 28
 end
-arch woodfloor
+arch evergreen
 x 24
 y 29
 end