--- cf.schmorp.de/maps/start/tutorial_part1.map	2008/05/06 19:16:52	1.8
+++ cf.schmorp.de/maps/start/tutorial_part1.map	2008/11/19 07:49:30	1.15
@@ -231,26 +231,14 @@
 x 2
 y 1
 end
-arch grass
-x 2
-y 2
-end
 arch biglake_2_1_1
 x 2
 y 2
 end
-arch grass
-x 2
-y 3
-end
 arch biglake_2_1_1
 x 2
 y 3
 end
-arch grass
-x 2
-y 4
-end
 arch biglake_2_1_1
 x 2
 y 4
@@ -332,7 +320,7 @@
 x 2
 y 19
 end
-arch wall_1_3
+arch wall_2_1_2
 x 2
 y 19
 end
@@ -347,26 +335,14 @@
 x 3
 y 1
 end
-arch grass
-x 3
-y 2
-end
 arch biglake_2_1_1
 x 3
 y 2
 end
-arch grass
-x 3
-y 3
-end
 arch biglake_2_1_1
 x 3
 y 3
 end
-arch grass
-x 3
-y 4
-end
 arch biglake_2_1_1
 x 3
 y 4
@@ -387,6 +363,10 @@
 x 3
 y 6
 end
+arch bird
+x 3
+y 6
+end
 arch woodfloor
 x 3
 y 7
@@ -451,13 +431,13 @@
 name Triggering Buttons with Weights
 msg
 Sometimes large buttons in the floor can
-be activated by a large weight.  Run into this
-boulder (B<Ctrl-Left>) to push it onto the button to your
-west, and see what happens.
+be activated by pushing a large a large weight on them.  Run into this
+boulder (B<Ctrl-UpArrow>) to push it onto the button to the north,
+and see what happens.
 
-Boulders and other "rollable" items like barrels can only be pushed,
+Boulders and other "movable" items like barrels can only be pushed,
 never pulled, so be careful not to push them into corners from where
-you won't be able to move them to their destination.
+you won't be able to move out.
 
 If you are very weak you may have to try a lot of times to move the boulder. Do not give up! Even
 weak characters can push things if they are persistent.
@@ -481,18 +461,6 @@
 x 3
 y 17
 end
-arch sign
-name Triggering Buttons with Weights
-msg
-The door in the south will bring you to the next
-part of this tutorial.
-
-Did you already figure out what the boulder does
-in the north?
-endmsg
-x 3
-y 17
-end
 arch woodfloor
 x 3
 y 18
@@ -501,10 +469,7 @@
 x 3
 y 19
 end
-arch exit
-slaying tutorial_part2
-hp 3
-sp 0
+arch wall_1_3
 x 3
 y 19
 end
@@ -600,27 +565,42 @@
 x 4
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 15
 end
-arch woodfloor
+arch sign
+name Triggering Buttons with Weights
+msg
+The portal to the south will bring you to the next
+part of this tutorial.
+
+Did you already figure out what the boulder does
+in the north?
+endmsg
+x 4
+y 15
+end
+arch woodfloor2
 x 4
 y 16
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 17
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 18
 end
-arch woodfloor
+arch woodfloor2
 x 4
 y 19
 end
-arch wall_1_4
+arch exit
+slaying tutorial_part2
+hp 3
+sp 1
 x 4
 y 19
 end
@@ -647,6 +627,10 @@
 x 5
 y 3
 end
+arch bee
+x 5
+y 3
+end
 arch grasspond
 x 5
 y 4
@@ -704,7 +688,7 @@
 x 5
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 5
 y 15
 end
@@ -735,6 +719,10 @@
 x 6
 y 1
 end
+arch bird
+x 6
+y 1
+end
 arch grasspond
 x 6
 y 2
@@ -804,7 +792,7 @@
 x 6
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 6
 y 15
 end
@@ -846,7 +834,7 @@
 x 7
 y 2
 end
-arch window_win1
+arch wall_2_1_1
 x 7
 y 2
 end
@@ -854,7 +842,7 @@
 x 7
 y 3
 end
-arch window_win1
+arch wall_2_1_1
 x 7
 y 3
 end
@@ -862,7 +850,7 @@
 x 7
 y 4
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 4
 end
@@ -870,7 +858,7 @@
 x 7
 y 5
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 5
 end
@@ -878,7 +866,7 @@
 x 7
 y 6
 end
-arch wall_2_1_1
+arch window_win1
 x 7
 y 6
 end
@@ -918,7 +906,7 @@
 x 7
 y 11
 end
-arch wall_3_2
+arch wall_2_2_1
 x 7
 y 11
 end
@@ -926,15 +914,11 @@
 x 7
 y 12
 end
-arch wall_3_2
-x 7
-y 12
-end
 arch woodfloor
 x 7
 y 13
 end
-arch wall_2_1_1
+arch wall_2_2_2
 x 7
 y 13
 end
@@ -946,7 +930,7 @@
 x 7
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 7
 y 15
 end
@@ -967,7 +951,7 @@
 x 7
 y 17
 end
-arch wall_2_2_1
+arch wall_2_1_1
 x 7
 y 17
 end
@@ -975,11 +959,15 @@
 x 7
 y 18
 end
+arch wall_2_1_1
+x 7
+y 18
+end
 arch woodfloor
 x 7
 y 19
 end
-arch wall_2_1_2
+arch wall_2_2_4
 x 7
 y 19
 end
@@ -989,7 +977,7 @@
 arch wall_2_1_2
 x 8
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 1
 end
@@ -998,7 +986,7 @@
 x 8
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 2
 end
@@ -1022,7 +1010,7 @@
 x 8
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 3
 end
@@ -1058,31 +1046,31 @@
 x 8
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 4
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 8
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 10
 end
@@ -1125,11 +1113,11 @@
 x 8
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 8
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 8
 y 13
 end
@@ -1141,7 +1129,7 @@
 x 8
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 8
 y 15
 end
@@ -1158,23 +1146,15 @@
 x 8
 y 16
 end
-arch woodfloor
-x 8
-y 17
-end
-arch wall_2_1_2
+arch grass
 x 8
 y 17
 end
-arch woodfloor
+arch grass
 x 8
 y 18
 end
-arch woodfloor
-x 8
-y 19
-end
-arch wall_2_1_2
+arch evergreen
 x 8
 y 19
 end
@@ -1256,7 +1236,7 @@
 x 9
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 10
 end
@@ -1272,15 +1252,11 @@
 x 9
 y 12
 end
-arch wall_3_3
-x 9
-y 12
-end
 arch woodfloor
 x 9
 y 13
 end
-arch wall_2_1_1
+arch wall_2_2_3
 x 9
 y 13
 end
@@ -1292,7 +1268,7 @@
 x 9
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 9
 y 15
 end
@@ -1314,19 +1290,15 @@
 x 9
 y 17
 end
-arch wall_2_2_4
+arch wall_2_2_1
 x 9
 y 17
 end
-arch woodfloor
+arch grass
 x 9
 y 18
 end
-arch woodfloor
-x 9
-y 19
-end
-arch wall_2_1_2
+arch evergreen
 x 9
 y 19
 end
@@ -1384,7 +1356,7 @@
 x 10
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 10
 end
@@ -1400,7 +1372,11 @@
 x 10
 y 12
 end
-arch wall_2_1_2
+arch sign_w
+name Trouble with the Lever?
+msg
+If you have trouble with the lever you can go this way.
+endmsg
 x 10
 y 12
 end
@@ -1412,7 +1388,7 @@
 x 10
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 10
 y 15
 end
@@ -1424,15 +1400,15 @@
 x 10
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 10
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 10
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 10
 y 19
 end
@@ -1458,7 +1434,7 @@
 x 11
 y 4
 end
-arch wall_2_1_2
+arch wall_2_2_3
 x 11
 y 4
 end
@@ -1466,7 +1442,7 @@
 x 11
 y 5
 end
-arch wall_2_1_2
+arch wall_2_2_4
 x 11
 y 5
 end
@@ -1490,7 +1466,7 @@
 x 11
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 10
 end
@@ -1498,7 +1474,7 @@
 x 11
 y 11
 end
-arch wall_2_1_2
+arch wall_3_3
 x 11
 y 11
 end
@@ -1506,7 +1482,7 @@
 x 11
 y 12
 end
-arch wall_2_1_2
+arch wall_2_1_1
 x 11
 y 12
 end
@@ -1514,11 +1490,15 @@
 x 11
 y 13
 end
+arch wall_2_2_1
+x 11
+y 13
+end
 arch woodfloor
 x 11
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 11
 y 15
 end
@@ -1530,15 +1510,15 @@
 x 11
 y 17
 end
-arch woodfloor
+arch window_win2
 x 11
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 11
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 11
 y 19
 end
@@ -1552,7 +1532,7 @@
 x 12
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 2
 end
@@ -1568,33 +1548,48 @@
 x 12
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 4
 end
-arch wall_2_2_3
+arch woodfloor2
 x 12
-y 4
+y 5
 end
-arch woodfloor
+arch woodfloor2
 x 12
-y 5
+y 6
 end
-arch wall_2_2_4
+arch magic_mouth
+msg
+A magic voice says:
+
+Here is a note you can pick up and take with you.  (You may have already picked it up
+automatically if your client is set to do that.  If so, find it in your inventory and read it by
+clicking with the middle mouse button or scroll wheel).  You may wish
+to read it first (press B<space> to apply it), and then pick it up (press the B<comma> key or use the B<take> command).
+Now it will be in your inventory, so you can read it anytime you need to.
+endmsg
 x 12
-y 5
+y 7
 end
-arch woodfloor
+arch woodfloor2
 x 12
-y 6
+y 7
 end
-arch woodfloor
+arch note
+msg
+Hah! Made you look!
+
+You can go to the next sign now :)
+endmsg
 x 12
 y 7
+identified 1
 end
 arch woodfloor
 x 12
@@ -1608,7 +1603,7 @@
 x 12
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 10
 end
@@ -1624,11 +1619,11 @@
 x 12
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 12
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 12
 y 13
 end
@@ -1636,7 +1631,7 @@
 x 12
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 12
 y 15
 end
@@ -1656,15 +1651,15 @@
 x 12
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 12
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 12
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 12
 y 19
 end
@@ -1678,7 +1673,7 @@
 x 13
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 2
 end
@@ -1690,40 +1685,25 @@
 x 13
 y 4
 end
-arch woodfloor
+arch wall_2_2_2
 x 13
-y 5
+y 4
 end
 arch woodfloor
 x 13
-y 6
+y 5
 end
-arch magic_mouth
-msg
-A magic voice says:
-
-Here is a note you can pick up and take with you.  (You may have already picked it up
-automatically if your client is set to do that.  If so, find it in your inventory and read it by
-clicking with the middle mouse button or scroll wheel).  You may wish
-to read it first (press B<space> to apply it), and then pick it up (press the B<comma> key or use the B<take> command).
-Now it will be in your inventory, so you can read it anytime you need to.
-endmsg
+arch wall_2_2_1
 x 13
-y 7
+y 5
 end
 arch woodfloor
 x 13
-y 7
+y 6
 end
-arch note
-msg
-Hah! Made you look!
-
-You can go to the next sign now :)
-endmsg
+arch woodfloor2
 x 13
 y 7
-identified 1
 end
 arch woodfloor
 x 13
@@ -1737,7 +1717,7 @@
 x 13
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 10
 end
@@ -1753,11 +1733,11 @@
 x 13
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 13
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 13
 y 13
 end
@@ -1765,7 +1745,7 @@
 x 13
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 13
 y 15
 end
@@ -1777,15 +1757,15 @@
 x 13
 y 17
 end
-arch woodfloor
+arch window_win2
 x 13
-y 18
+y 17
 end
-arch woodfloor
+arch grasspond
 x 13
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 13
 y 19
 end
@@ -1801,7 +1781,7 @@
 end
 arch magic_mouth
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 This is a standard food.  You can apply it while
 it's on the ground, the same way you apply
@@ -1811,7 +1791,7 @@
 x 14
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 2
 end
@@ -1827,7 +1807,7 @@
 x 14
 y 4
 end
-arch wall_2_2_2
+arch wall_2_1_2
 x 14
 y 4
 end
@@ -1835,7 +1815,7 @@
 x 14
 y 5
 end
-arch wall_2_2_1
+arch wall_2_1_2
 x 14
 y 5
 end
@@ -1843,7 +1823,7 @@
 x 14
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 7
 end
@@ -1866,7 +1846,7 @@
 x 14
 y 10
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 10
 end
@@ -1882,11 +1862,11 @@
 x 14
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 14
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 14
 y 13
 end
@@ -1894,7 +1874,7 @@
 x 14
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 14
 y 15
 end
@@ -1906,15 +1886,15 @@
 x 14
 y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 14
-y 18
+y 17
 end
-arch woodfloor
+arch grass
 x 14
-y 19
+y 18
 end
-arch wall_2_1_2
+arch evergreen
 x 14
 y 19
 end
@@ -1928,20 +1908,7 @@
 x 15
 y 1
 end
-arch magic_mouth
-msg
-A message scrawled on the wall says:
-
-There are many types of food you can eat.
-Be careful, though: food that you find may be
-poisonous, so to be safe, don't eat food until
-you've identified it.  (More on identifying items
-later.)
-endmsg
-x 15
-y 2
-end
-arch woodfloor
+arch woodfloor2
 x 15
 y 2
 end
@@ -1969,7 +1936,7 @@
 x 15
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 7
 end
@@ -1985,7 +1952,7 @@
 x 15
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 10
 end
@@ -2001,15 +1968,11 @@
 x 15
 y 12
 end
-arch wall_3_3
-x 15
-y 12
-end
 arch woodfloor
 x 15
 y 13
 end
-arch wall_2_2_1
+arch wall_2_2_3
 x 15
 y 13
 end
@@ -2017,25 +1980,25 @@
 x 15
 y 14
 end
-arch button_trigger
+arch wall_2_2_1
 x 15
 y 14
-invisible 1
-connected 2
 end
-arch woodfloor
+arch woodfloor2
 x 15
 y 15
 end
-arch wall_2_2_2
+arch button_trigger
 x 15
 y 15
+invisible 1
+connected 2
 end
 arch woodfloor
 x 15
 y 16
 end
-arch wall_3_2
+arch wall_2_2_2
 x 15
 y 16
 end
@@ -2043,23 +2006,15 @@
 x 15
 y 17
 end
-arch wall_2_1_1
+arch wall_2_2_4
 x 15
 y 17
 end
-arch woodfloor
-x 15
-y 18
-end
-arch wall_2_1_1
+arch grasspond
 x 15
 y 18
 end
-arch woodfloor
-x 15
-y 19
-end
-arch wall_2_2_4
+arch evergreen
 x 15
 y 19
 end
@@ -2075,7 +2030,7 @@
 end
 arch magic_mouth
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 There are many types of food you can eat.
 Be careful, though: food that you find may be
@@ -2086,7 +2041,7 @@
 x 16
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 2
 end
@@ -2118,7 +2073,7 @@
 x 16
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 7
 end
@@ -2134,7 +2089,7 @@
 x 16
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 10
 end
@@ -2150,34 +2105,26 @@
 x 16
 y 12
 end
-arch wall_2_1_2
-x 16
-y 12
-end
 arch woodfloor
 x 16
 y 13
 end
-arch wall_2_1_2
-x 16
-y 13
-end
 arch woodfloor
 x 16
 y 14
 end
-arch igateTrg2
+arch wall_2_1_2
 x 16
 y 14
-connected 2
 end
-arch woodfloor
+arch woodfloor2
 x 16
 y 15
 end
-arch wall_2_1_2
+arch igateTrg2
 x 16
 y 15
+connected 2
 end
 arch woodfloor
 x 16
@@ -2187,15 +2134,19 @@
 x 16
 y 16
 end
-arch woodfloor
+arch grass
 x 16
 y 17
 end
-arch woodfloor
+arch flowers_permanent
+x 16
+y 17
+end
+arch grass
 x 16
 y 18
 end
-arch woodfloor
+arch evergreen
 x 16
 y 19
 end
@@ -2209,11 +2160,7 @@
 x 17
 y 1
 end
-arch magic_mouth
-x 17
-y 2
-end
-arch woodfloor
+arch woodfloor2
 x 17
 y 2
 end
@@ -2241,7 +2188,7 @@
 x 17
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 7
 end
@@ -2257,7 +2204,7 @@
 x 17
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 10
 end
@@ -2273,15 +2220,11 @@
 x 17
 y 12
 end
-arch wall_3_3
-x 17
-y 12
-end
 arch woodfloor
 x 17
 y 13
 end
-arch wall_2_2_4
+arch wall_2_2_2
 x 17
 y 13
 end
@@ -2289,25 +2232,25 @@
 x 17
 y 14
 end
-arch button_trigger
+arch wall_2_2_4
 x 17
 y 14
-invisible 1
-connected 2
 end
-arch woodfloor
+arch woodfloor2
 x 17
 y 15
 end
-arch wall_2_2_3
+arch button_trigger
 x 17
 y 15
+invisible 1
+connected 2
 end
 arch woodfloor
 x 17
 y 16
 end
-arch wall_3_1
+arch wall_2_2_3
 x 17
 y 16
 end
@@ -2315,11 +2258,15 @@
 x 17
 y 17
 end
-arch woodfloor
+arch wall_2_2_1
+x 17
+y 17
+end
+arch grass
 x 17
 y 18
 end
-arch woodfloor
+arch evergreen
 x 17
 y 19
 end
@@ -2335,7 +2282,7 @@
 end
 arch magic_mouth
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 When you kill monsters, sometimes they leave
 body parts behind, and these can be taken and
@@ -2344,7 +2291,7 @@
 x 18
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 2
 end
@@ -2377,7 +2324,7 @@
 x 18
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 7
 end
@@ -2393,7 +2340,7 @@
 x 18
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 10
 end
@@ -2409,11 +2356,11 @@
 x 18
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 18
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 18
 y 13
 end
@@ -2421,7 +2368,7 @@
 x 18
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 18
 y 15
 end
@@ -2429,19 +2376,23 @@
 x 18
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 18
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 18
 y 17
 end
-arch woodfloor
+arch grass
 x 18
 y 18
 end
-arch woodfloor
+arch flowers_permanent
+x 18
+y 18
+end
+arch evergreen
 x 18
 y 19
 end
@@ -2455,7 +2406,7 @@
 x 19
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 19
 y 2
 end
@@ -2483,19 +2434,19 @@
 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
@@ -2540,11 +2491,11 @@
 x 19
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 19
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 19
 y 13
 end
@@ -2552,6 +2503,10 @@
 x 19
 y 14
 end
+arch woodfloor2
+x 19
+y 15
+end
 arch sign
 name Traps, and Automatic Doors
 msg
@@ -2575,29 +2530,25 @@
 too long!
 endmsg
 x 19
-y 14
-end
-arch woodfloor
-x 19
 y 15
 end
 arch woodfloor
 x 19
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 19
-y 16
+y 17
 end
-arch woodfloor
+arch window_win2
 x 19
 y 17
 end
-arch woodfloor
+arch grass
 x 19
 y 18
 end
-arch woodfloor
+arch evergreen
 x 19
 y 19
 end
@@ -2612,16 +2563,8 @@
 y 1
 end
 arch magic_mouth
-x 20
-y 2
-end
-arch woodfloor
-x 20
-y 2
-end
-arch waybread
 msg
-A message scrawled on the wall says:
+A message scrawled on the floor says:
 
 Waybreads are the MRE (Meals-Ready-to-Eat)
 of Deliantra. They weigh very little but pack
@@ -2634,6 +2577,14 @@
 x 20
 y 2
 end
+arch woodfloor2
+x 20
+y 2
+end
+arch waybread
+x 20
+y 2
+end
 arch woodfloor
 x 20
 y 3
@@ -2706,11 +2657,11 @@
 x 20
 y 12
 end
-arch wall_2_1_2
+arch woodfloor
 x 20
-y 12
+y 13
 end
-arch woodfloor
+arch wall_2_1_2
 x 20
 y 13
 end
@@ -2718,7 +2669,7 @@
 x 20
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 20
 y 15
 end
@@ -2726,19 +2677,19 @@
 x 20
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 20
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 20
 y 17
 end
-arch woodfloor
+arch grass
 x 20
 y 18
 end
-arch woodfloor
+arch evergreen
 x 20
 y 19
 end
@@ -2752,7 +2703,7 @@
 x 21
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 21
 y 2
 end
@@ -2828,7 +2779,7 @@
 x 21
 y 12
 end
-arch wall_2_2_4
+arch wall_2_1_1
 x 21
 y 12
 end
@@ -2836,11 +2787,15 @@
 x 21
 y 13
 end
+arch wall_2_2_4
+x 21
+y 13
+end
 arch woodfloor
 x 21
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 21
 y 15
 end
@@ -2848,19 +2803,19 @@
 x 21
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 21
-y 16
+y 17
 end
-arch woodfloor
+arch window_win2
 x 21
 y 17
 end
-arch woodfloor
+arch grass
 x 21
 y 18
 end
-arch woodfloor
+arch evergreen
 x 21
 y 19
 end
@@ -2874,7 +2829,7 @@
 x 22
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 2
 end
@@ -2930,7 +2885,7 @@
 x 22
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 22
 y 15
 end
@@ -2938,19 +2893,19 @@
 x 22
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 22
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 22
 y 17
 end
-arch woodfloor
+arch grass
 x 22
 y 18
 end
-arch woodfloor
+arch evergreen
 x 22
 y 19
 end
@@ -2964,7 +2919,7 @@
 x 23
 y 1
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 2
 end
@@ -2988,11 +2943,11 @@
 x 23
 y 2
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 3
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 4
 end
@@ -3000,12 +2955,13 @@
 hp 4
 x 23
 y 4
+randomitems 
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 5
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 6
 end
@@ -3017,39 +2973,39 @@
 x 23
 y 6
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 7
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 8
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 9
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 10
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 11
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 12
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 13
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 14
 end
-arch woodfloor
+arch woodfloor2
 x 23
 y 15
 end
@@ -3057,19 +3013,19 @@
 x 23
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 23
-y 16
+y 17
 end
-arch woodfloor
+arch window_win2
 x 23
 y 17
 end
-arch woodfloor
+arch grasspond
 x 23
 y 18
 end
-arch woodfloor
+arch evergreen
 x 23
 y 19
 end
@@ -3147,19 +3103,19 @@
 x 24
 y 16
 end
-arch wall_2_1_2
+arch woodfloor
 x 24
-y 16
+y 17
 end
-arch woodfloor
+arch wall_2_1_2
 x 24
 y 17
 end
-arch woodfloor
+arch grass
 x 24
 y 18
 end
-arch woodfloor
+arch evergreen
 x 24
 y 19
 end
@@ -3173,7 +3129,7 @@
 x 25
 y 1
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 1
 end
@@ -3229,7 +3185,7 @@
 x 25
 y 8
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 8
 end
@@ -3253,7 +3209,7 @@
 x 25
 y 11
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 11
 end
@@ -3277,7 +3233,7 @@
 x 25
 y 14
 end
-arch wall_2_1_1
+arch window_win1
 x 25
 y 14
 end
@@ -3293,7 +3249,7 @@
 x 25
 y 16
 end
-arch wall_2_2_4
+arch wall_2_1_1
 x 25
 y 16
 end
@@ -3301,18 +3257,22 @@
 x 25
 y 17
 end
-arch woodfloor
+arch wall_2_2_4
+x 25
+y 17
+end
+arch grass
 x 25
 y 18
 end
-arch woodfloor
+arch evergreen
 x 25
 y 19
 end
-arch woodfloor
+arch evergreen
 x 26
 end
-arch woodfloor
+arch grass
 x 26
 y 1
 end
@@ -3320,7 +3280,7 @@
 x 26
 y 2
 end
-arch wall_2_1_2
+arch window_win2
 x 26
 y 2
 end
@@ -3344,62 +3304,70 @@
 x 26
 y 7
 end
-arch wall_2_1_2
+arch window_win2
 x 26
 y 7
 end
-arch woodfloor
+arch grass
 x 26
 y 8
 end
-arch woodfloor
+arch grass
 x 26
 y 9
 end
-arch woodfloor
+arch grasspond
 x 26
 y 10
 end
-arch woodfloor
+arch grass
 x 26
 y 11
 end
-arch woodfloor
+arch grass
 x 26
 y 12
 end
-arch woodfloor
+arch grass
 x 26
 y 13
 end
-arch woodfloor
+arch flowers_permanent
+x 26
+y 13
+end
+arch grass
 x 26
 y 14
 end
-arch woodfloor
+arch grass
 x 26
 y 15
 end
-arch woodfloor
+arch grass
 x 26
 y 16
 end
-arch woodfloor
+arch grass
 x 26
 y 17
 end
-arch woodfloor
+arch bird
+x 26
+y 17
+end
+arch grass
 x 26
 y 18
 end
-arch woodfloor
+arch evergreen
 x 26
 y 19
 end
-arch woodfloor
+arch evergreen
 x 27
 end
-arch woodfloor
+arch evergreen
 x 27
 y 1
 end
@@ -3451,51 +3419,51 @@
 x 27
 y 7
 end
-arch woodfloor
+arch evergreen
 x 27
 y 8
 end
-arch woodfloor
+arch evergreen
 x 27
 y 9
 end
-arch woodfloor
+arch evergreen
 x 27
 y 10
 end
-arch woodfloor
+arch evergreen
 x 27
 y 11
 end
-arch woodfloor
+arch evergreen
 x 27
 y 12
 end
-arch woodfloor
+arch evergreen
 x 27
 y 13
 end
-arch woodfloor
+arch evergreen
 x 27
 y 14
 end
-arch woodfloor
+arch evergreen
 x 27
 y 15
 end
-arch woodfloor
+arch evergreen
 x 27
 y 16
 end
-arch woodfloor
+arch evergreen
 x 27
 y 17
 end
-arch woodfloor
+arch evergreen
 x 27
 y 18
 end
-arch woodfloor
+arch evergreen
 x 27
 y 19
 end