diff --git a/pup_land/castle_eureca/cave_pass b/pup_land/castle_eureca/cave_pass
index 9c49a4bca..6e2e37e78 100644
--- a/pup_land/castle_eureca/cave_pass
+++ b/pup_land/castle_eureca/cave_pass
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 1
 msg
 Created:  1996-02-27
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch blocked
@@ -517,6 +517,9 @@ arch blocked
 x 2
 y 31
 end
+arch pstone_1
+x 3
+end
 arch mine2
 x 3
 end
@@ -572,30 +575,58 @@ arch generate_ant
 x 3
 y 7
 end
+arch pstone_1
+x 3
+y 8
+end
 arch mine10
 x 3
 y 8
 end
-arch mine3
+arch pstone_1
 x 3
 y 9
 end
 arch mine3
 x 3
+y 9
+end
+arch pstone_1
+x 3
 y 10
 end
 arch mine3
 x 3
+y 10
+end
+arch pstone_1
+x 3
 y 11
 end
 arch mine3
 x 3
+y 11
+end
+arch pstone_1
+x 3
 y 12
 end
+arch mine3
+x 3
+y 12
+end
+arch pstone_1
+x 3
+y 13
+end
 arch mine11
 x 3
 y 13
 end
+arch pstone_1
+x 3
+y 14
+end
 arch mine4
 x 3
 y 14
@@ -640,6 +671,10 @@ arch mine10
 x 3
 y 19
 end
+arch pstone_1
+x 3
+y 20
+end
 arch mine4
 x 3
 y 20
@@ -742,18 +777,34 @@ arch mine8
 x 4
 y 4
 end
-arch mine3
+arch pstone_1
 x 4
 y 5
 end
 arch mine3
 x 4
+y 5
+end
+arch pstone_1
+x 4
 y 6
 end
 arch mine3
 x 4
+y 6
+end
+arch pstone_1
+x 4
 y 7
 end
+arch mine3
+x 4
+y 7
+end
+arch pstone_1
+x 4
+y 8
+end
 arch mine12
 x 4
 y 8
@@ -790,42 +841,82 @@ arch slime
 x 4
 y 12
 end
+arch pstone_1
+x 4
+y 13
+end
 arch blocked
 x 4
 y 13
 end
+arch pstone_1
+x 4
+y 14
+end
 arch mine17
 x 4
 y 14
 end
-arch mine3
+arch pstone_1
 x 4
 y 15
 end
 arch mine3
 x 4
+y 15
+end
+arch pstone_1
+x 4
 y 16
 end
 arch mine3
 x 4
+y 16
+end
+arch pstone_1
+x 4
 y 17
 end
 arch mine3
 x 4
+y 17
+end
+arch pstone_1
+x 4
 y 18
 end
+arch mine3
+x 4
+y 18
+end
+arch pstone_1
+x 4
+y 19
+end
 arch blocked
 x 4
 y 19
 end
+arch pstone_1
+x 4
+y 20
+end
 arch mine14
 x 4
 y 20
 end
+arch pstone_1
+x 4
+y 21
+end
 arch mine3
 x 4
 y 21
 end
+arch pstone_1
+x 4
+y 22
+end
 arch mine4
 x 4
 y 22
@@ -854,6 +945,10 @@ arch mine8
 x 4
 y 25
 end
+arch pstone_1
+x 4
+y 26
+end
 arch mine11
 x 4
 y 26
@@ -993,6 +1088,10 @@ arch slime
 x 5
 y 13
 end
+arch pstone_1
+x 5
+y 14
+end
 arch mine2
 x 5
 y 14
@@ -1053,10 +1152,18 @@ arch orc
 x 5
 y 21
 end
+arch pstone_1
+x 5
+y 22
+end
 arch mine9
 x 5
 y 22
 end
+arch pstone_1
+x 5
+y 23
+end
 arch mine4
 x 5
 y 23
@@ -1159,22 +1266,42 @@ arch mine8
 x 6
 y 6
 end
+arch pstone_1
+x 6
+y 7
+end
 arch mine3
 x 6
 y 7
 end
-arch mine11
+arch pstone_1
 x 6
 y 8
 end
 arch mine11
 x 6
+y 8
+end
+arch pstone_1
+x 6
 y 9
 end
 arch mine11
 x 6
+y 9
+end
+arch pstone_1
+x 6
 y 10
 end
+arch mine11
+x 6
+y 10
+end
+arch pstone_1
+x 6
+y 11
+end
 arch mine4
 x 6
 y 11
@@ -1195,6 +1322,10 @@ arch slime
 x 6
 y 13
 end
+arch pstone_1
+x 6
+y 14
+end
 arch mine2
 x 6
 y 14
@@ -1207,22 +1338,42 @@ arch orc
 x 6
 y 15
 end
+arch pstone_1
+x 6
+y 16
+end
 arch mine10
 x 6
 y 16
 end
-arch mine3
+arch pstone_1
 x 6
 y 17
 end
 arch mine3
 x 6
+y 17
+end
+arch pstone_1
+x 6
 y 18
 end
 arch mine3
 x 6
+y 18
+end
+arch pstone_1
+x 6
 y 19
 end
+arch mine3
+x 6
+y 19
+end
+arch pstone_1
+x 6
+y 20
+end
 arch mine4
 x 6
 y 20
@@ -1243,6 +1394,10 @@ arch generate_orc
 x 6
 y 22
 end
+arch pstone_1
+x 6
+y 23
+end
 arch mine2
 x 6
 y 23
@@ -1295,13 +1450,24 @@ arch blocked
 x 6
 y 31
 end
+arch pstone_1
+x 7
+end
 arch mine16
 x 7
 end
+arch pstone_1
+x 7
+y 1
+end
 arch mine11
 x 7
 y 1
 end
+arch pstone_1
+x 7
+y 2
+end
 arch mine4
 x 7
 y 2
@@ -1350,6 +1516,10 @@ arch blocked
 x 7
 y 10
 end
+arch pstone_1
+x 7
+y 11
+end
 arch mine12
 x 7
 y 11
@@ -1370,6 +1540,10 @@ arch slime
 x 7
 y 13
 end
+arch pstone_1
+x 7
+y 14
+end
 arch mine2
 x 7
 y 14
@@ -1382,6 +1556,10 @@ arch orc
 x 7
 y 15
 end
+arch pstone_1
+x 7
+y 16
+end
 arch mine2
 x 7
 y 16
@@ -1398,6 +1576,10 @@ arch pstone_2
 x 7
 y 19
 end
+arch pstone_1
+x 7
+y 20
+end
 arch mine2
 x 7
 y 20
@@ -1418,24 +1600,44 @@ arch mine8
 x 7
 y 22
 end
+arch pstone_1
+x 7
+y 23
+end
 arch mine14
 x 7
 y 23
 end
-arch mine11
+arch pstone_1
 x 7
 y 24
 end
 arch mine11
 x 7
+y 24
+end
+arch pstone_1
+x 7
 y 25
 end
 arch mine11
 x 7
+y 25
+end
+arch pstone_1
+x 7
 y 26
 end
 arch mine11
 x 7
+y 26
+end
+arch pstone_1
+x 7
+y 27
+end
+arch mine11
+x 7
 y 27
 end
 arch blocked
@@ -1461,14 +1663,26 @@ arch blocked
 x 8
 y 1
 end
+arch pstone_1
+x 8
+y 2
+end
 arch mine17
 x 8
 y 2
 end
+arch pstone_1
+x 8
+y 3
+end
 arch mine11
 x 8
 y 3
 end
+arch pstone_1
+x 8
+y 4
+end
 arch mine11
 x 8
 y 4
@@ -1541,6 +1755,10 @@ arch slime
 x 8
 y 13
 end
+arch pstone_1
+x 8
+y 14
+end
 arch mine2
 x 8
 y 14
@@ -1553,6 +1771,10 @@ arch orc
 x 8
 y 15
 end
+arch pstone_1
+x 8
+y 16
+end
 arch mine2
 x 8
 y 16
@@ -1573,6 +1795,10 @@ arch pstone_2
 x 8
 y 19
 end
+arch pstone_1
+x 8
+y 20
+end
 arch mine2
 x 8
 y 20
@@ -1652,6 +1878,10 @@ arch blocked
 x 9
 y 4
 end
+arch pstone_1
+x 9
+y 5
+end
 arch mine13
 x 9
 y 5
@@ -1708,6 +1938,10 @@ arch mine10
 x 9
 y 13
 end
+arch pstone_1
+x 9
+y 14
+end
 arch mine13
 x 9
 y 14
@@ -1720,6 +1954,10 @@ arch orc
 x 9
 y 15
 end
+arch pstone_1
+x 9
+y 16
+end
 arch mine2
 x 9
 y 16
@@ -1728,6 +1966,10 @@ arch pstone_2
 x 9
 y 17
 end
+arch pstone_1
+x 9
+y 18
+end
 arch mine2
 x 9
 y 18
@@ -1747,6 +1989,10 @@ arch raas
 x 9
 y 19
 end
+arch pstone_1
+x 9
+y 20
+end
 arch mine2
 x 9
 y 20
@@ -1912,10 +2158,18 @@ arch mine8
 x 10
 y 11
 end
+arch pstone_1
+x 10
+y 12
+end
 arch mine3
 x 10
 y 12
 end
+arch pstone_1
+x 10
+y 13
+end
 arch blocked
 x 10
 y 13
@@ -1936,6 +2190,10 @@ arch orc
 x 10
 y 15
 end
+arch pstone_1
+x 10
+y 16
+end
 arch mine2
 x 10
 y 16
@@ -1944,34 +2202,66 @@ arch pstone_1
 x 10
 y 17
 end
+arch pstone_1
+x 10
+y 18
+end
 arch mine9
 x 10
 y 18
 end
+arch pstone_1
+x 10
+y 19
+end
 arch mine3
 x 10
 y 19
 end
+arch pstone_1
+x 10
+y 20
+end
 arch mine14
 x 10
 y 20
 end
-arch mine3
+arch pstone_1
 x 10
 y 21
 end
 arch mine3
 x 10
+y 21
+end
+arch pstone_1
+x 10
 y 22
 end
 arch mine3
 x 10
+y 22
+end
+arch pstone_1
+x 10
 y 23
 end
 arch mine3
 x 10
+y 23
+end
+arch pstone_1
+x 10
 y 24
 end
+arch mine3
+x 10
+y 24
+end
+arch pstone_1
+x 10
+y 25
+end
 arch mine4
 x 10
 y 25
@@ -2019,6 +2309,10 @@ arch blocked
 x 11
 y 1
 end
+arch pstone_1
+x 11
+y 2
+end
 arch mine13
 x 11
 y 2
@@ -2111,6 +2405,10 @@ arch orc
 x 11
 y 15
 end
+arch pstone_1
+x 11
+y 16
+end
 arch mine2
 x 11
 y 16
@@ -2175,20 +2473,36 @@ arch generate_bat
 x 11
 y 24
 end
+arch pstone_1
+x 11
+y 25
+end
 arch mine9
 x 11
 y 25
 end
-arch mine3
+arch pstone_1
 x 11
 y 26
 end
 arch mine3
 x 11
+y 26
+end
+arch pstone_1
+x 11
 y 27
 end
 arch mine3
 x 11
+y 27
+end
+arch pstone_1
+x 11
+y 28
+end
+arch mine3
+x 11
 y 28
 end
 arch blocked
@@ -2210,10 +2524,18 @@ arch blocked
 x 12
 y 1
 end
+arch pstone_1
+x 12
+y 2
+end
 arch mine17
 x 12
 y 2
 end
+arch pstone_1
+x 12
+y 3
+end
 arch mine11
 x 12
 y 3
@@ -2319,40 +2641,76 @@ arch mine8
 x 12
 y 11
 end
-arch mine3
+arch pstone_1
 x 12
 y 12
 end
 arch mine3
 x 12
+y 12
+end
+arch pstone_1
+x 12
 y 13
 end
 arch mine3
 x 12
+y 13
+end
+arch pstone_1
+x 12
 y 14
 end
 arch mine3
 x 12
+y 14
+end
+arch pstone_1
+x 12
 y 15
 end
+arch mine3
+x 12
+y 15
+end
+arch pstone_1
+x 12
+y 16
+end
 arch mine14
 x 12
 y 16
 end
-arch mine3
+arch pstone_1
 x 12
 y 17
 end
 arch mine3
 x 12
+y 17
+end
+arch pstone_1
+x 12
 y 18
 end
 arch mine3
 x 12
+y 18
+end
+arch pstone_1
+x 12
 y 19
 end
 arch mine3
 x 12
+y 19
+end
+arch pstone_1
+x 12
+y 20
+end
+arch mine3
+x 12
 y 20
 end
 arch pstone_1
@@ -2442,6 +2800,10 @@ arch blocked
 x 13
 y 2
 end
+arch pstone_1
+x 13
+y 3
+end
 arch mine13
 x 13
 y 3
@@ -2606,16 +2968,28 @@ arch mine10
 x 13
 y 25
 end
-arch mine11
+arch pstone_1
 x 13
 y 26
 end
 arch mine11
 x 13
+y 26
+end
+arch pstone_1
+x 13
 y 27
 end
 arch mine11
 x 13
+y 27
+end
+arch pstone_1
+x 13
+y 28
+end
+arch mine11
+x 13
 y 28
 end
 arch blocked
@@ -2641,10 +3015,18 @@ arch blocked
 x 14
 y 2
 end
+arch pstone_1
+x 14
+y 3
+end
 arch mine17
 x 14
 y 3
 end
+arch pstone_1
+x 14
+y 4
+end
 arch mine4
 x 14
 y 4
@@ -2797,6 +3179,10 @@ arch mine10
 x 14
 y 23
 end
+arch pstone_1
+x 14
+y 24
+end
 arch mine11
 x 14
 y 24
@@ -2844,80 +3230,156 @@ arch blocked
 x 15
 y 3
 end
+arch pstone_1
+x 15
+y 4
+end
 arch mine14
 x 15
 y 4
 end
-arch mine3
+arch pstone_1
 x 15
 y 5
 end
 arch mine3
 x 15
+y 5
+end
+arch pstone_1
+x 15
 y 6
 end
 arch mine3
 x 15
+y 6
+end
+arch pstone_1
+x 15
 y 7
 end
 arch mine3
 x 15
+y 7
+end
+arch pstone_1
+x 15
 y 8
 end
+arch mine3
+x 15
+y 8
+end
+arch pstone_1
+x 15
+y 9
+end
 arch mine14
 x 15
 y 9
 end
-arch mine3
+arch pstone_1
 x 15
 y 10
 end
 arch mine3
 x 15
+y 10
+end
+arch pstone_1
+x 15
 y 11
 end
 arch mine3
 x 15
+y 11
+end
+arch pstone_1
+x 15
 y 12
 end
 arch mine3
 x 15
+y 12
+end
+arch pstone_1
+x 15
 y 13
 end
 arch mine3
 x 15
+y 13
+end
+arch pstone_1
+x 15
 y 14
 end
 arch mine3
 x 15
+y 14
+end
+arch pstone_1
+x 15
 y 15
 end
 arch mine3
 x 15
+y 15
+end
+arch pstone_1
+x 15
 y 16
 end
 arch mine3
 x 15
+y 16
+end
+arch pstone_1
+x 15
 y 17
 end
 arch mine3
 x 15
+y 17
+end
+arch pstone_1
+x 15
 y 18
 end
 arch mine3
 x 15
+y 18
+end
+arch pstone_1
+x 15
 y 19
 end
 arch mine3
 x 15
+y 19
+end
+arch pstone_1
+x 15
 y 20
 end
 arch mine3
 x 15
+y 20
+end
+arch pstone_1
+x 15
 y 21
 end
 arch mine3
 x 15
+y 21
+end
+arch pstone_1
+x 15
+y 22
+end
+arch mine3
+x 15
 y 22
 end
 arch blocked
diff --git a/pup_land/castle_eureca/cave_pass2 b/pup_land/castle_eureca/cave_pass2
index cee6e9273..43811a38f 100644
--- a/pup_land/castle_eureca/cave_pass2
+++ b/pup_land/castle_eureca/cave_pass2
@@ -9,6 +9,7 @@ enter_x 9
 enter_y 10
 msg
 Created:  1996-02-28
+Modified: 2008-06-06 Arvid Norlander
 endmsg
 end
 arch blocked
@@ -70,243 +71,63 @@ end
 arch blocked
 y 19
 end
-arch mine10
-y 20
-end
 arch blocked
 y 20
 end
-arch mine10
-y 20
-end
-arch blocked
-y 20
-end
-arch mine3
-y 21
-end
 arch blocked
 y 21
 end
-arch mine11
-y 21
-end
-arch blocked
-y 21
-end
-arch mine3
-y 22
-end
 arch blocked
 y 22
 end
-arch mine3
-y 22
-end
-arch blocked
-y 22
-end
-arch mine3
-y 23
-end
 arch blocked
 y 23
 end
-arch mine3
-y 23
-end
-arch blocked
-y 23
-end
-arch mine3
-y 24
-end
 arch blocked
 y 24
 end
-arch mine11
-y 24
-end
-arch blocked
-y 24
-end
-arch mine3
-y 25
-end
 arch blocked
 y 25
 end
-arch mine11
-y 25
-end
-arch blocked
-y 25
-end
-arch mine3
-y 26
-end
 arch blocked
 y 26
 end
-arch mine11
-y 26
-end
-arch blocked
-y 26
-end
-arch mine3
-y 27
-end
 arch blocked
 y 27
 end
-arch mine11
-y 27
-end
-arch blocked
-y 27
-end
-arch mine3
-y 28
-end
 arch blocked
 y 28
 end
-arch mine11
-y 28
-end
-arch blocked
-y 28
-end
-arch mine3
-y 29
-end
 arch blocked
 y 29
 end
-arch mine11
-y 29
-end
-arch blocked
-y 29
-end
-arch mine3
-y 30
-end
 arch blocked
 y 30
 end
-arch mine11
-y 30
-end
-arch blocked
-y 30
-end
-arch mine3
-y 31
-end
 arch blocked
 y 31
 end
-arch mine3
-y 31
-end
-arch blocked
-y 31
-end
-arch mine3
-y 32
-end
 arch blocked
 y 32
 end
-arch mine3
-y 32
-end
-arch blocked
-y 32
-end
-arch mine3
-y 33
-end
 arch blocked
 y 33
 end
-arch mine3
-y 33
-end
-arch blocked
-y 33
-end
-arch mine3
-y 34
-end
 arch blocked
 y 34
 end
-arch mine3
-y 34
-end
-arch blocked
-y 34
-end
-arch mine3
-y 35
-end
 arch blocked
 y 35
 end
-arch mine3
-y 35
-end
-arch blocked
-y 35
-end
-arch mine3
-y 36
-end
 arch blocked
 y 36
 end
-arch mine11
-y 36
-end
-arch blocked
-y 36
-end
-arch mine3
-y 37
-end
 arch blocked
 y 37
 end
-arch mine11
-y 37
-end
-arch blocked
-y 37
-end
-arch mine3
-y 38
-end
 arch blocked
 y 38
 end
-arch mine11
-y 38
-end
-arch blocked
-y 38
-end
-arch mine4
-y 39
-end
-arch blocked
-y 39
-end
-arch mine4
-y 39
-end
 arch blocked
 y 39
 end
@@ -424,14 +245,14 @@ arch blocked
 x 1
 y 19
 end
-arch mine16
-x 1
-y 20
-end
 arch blocked
 x 1
 y 20
 end
+arch flagstone
+x 1
+y 21
+end
 arch mine13
 x 1
 y 21
@@ -444,52 +265,28 @@ arch flagstone
 x 1
 y 23
 end
-arch mine9
-x 1
-y 24
-end
 arch blocked
 x 1
 y 24
 end
-arch mine14
+arch blocked
 x 1
 y 25
 end
 arch blocked
 x 1
-y 25
-end
-arch mine14
-x 1
 y 26
 end
 arch blocked
 x 1
-y 26
-end
-arch mine14
-x 1
 y 27
 end
 arch blocked
 x 1
-y 27
-end
-arch mine14
-x 1
 y 28
 end
 arch blocked
 x 1
-y 28
-end
-arch mine14
-x 1
-y 29
-end
-arch blocked
-x 1
 y 29
 end
 arch flagstone
@@ -520,49 +317,29 @@ arch flagstone
 x 1
 y 35
 end
-arch mine9
-x 1
-y 36
-end
 arch blocked
 x 1
 y 36
 end
-arch mine14
+arch blocked
 x 1
 y 37
 end
 arch blocked
 x 1
-y 37
-end
-arch mine14
-x 1
 y 38
 end
 arch blocked
 x 1
-y 38
-end
-arch mine2
-x 1
-y 39
-end
-arch blocked
-x 1
-y 39
-end
-arch mine13
-x 1
-y 39
-end
-arch blocked
-x 1
 y 39
 end
 arch blocked
 x 2
 end
+arch dungeon_floor
+x 2
+y 1
+end
 arch mine13
 x 2
 y 1
@@ -678,14 +455,14 @@ arch blocked
 x 2
 y 19
 end
-arch mine16
-x 2
-y 20
-end
 arch blocked
 x 2
 y 20
 end
+arch flagstone
+x 2
+y 21
+end
 arch mine13
 x 2
 y 21
@@ -782,18 +559,6 @@ arch flagstone
 x 2
 y 38
 end
-arch mine2
-x 2
-y 39
-end
-arch blocked
-x 2
-y 39
-end
-arch mine2
-x 2
-y 39
-end
 arch blocked
 x 2
 y 39
@@ -877,6 +642,10 @@ arch blocked
 x 3
 y 11
 end
+arch dungeon_floor
+x 3
+y 12
+end
 arch mine13
 x 3
 y 12
@@ -921,10 +690,6 @@ arch blocked
 x 3
 y 19
 end
-arch mine16
-x 3
-y 20
-end
 arch blocked
 x 3
 y 20
@@ -1025,21 +790,12 @@ arch flagstone
 x 3
 y 38
 end
-arch mine2
-x 3
-y 39
-end
 arch blocked
 x 3
 y 39
 end
-arch mine2
-x 3
-y 39
-end
-arch blocked
-x 3
-y 39
+arch dungeon_floor
+x 4
 end
 arch mine2
 x 4
@@ -1108,6 +864,10 @@ arch blocked
 x 4
 y 11
 end
+arch dungeon_floor
+x 4
+y 12
+end
 arch mine13
 x 4
 y 12
@@ -1140,6 +900,10 @@ arch blocked
 x 4
 y 19
 end
+arch flagstone
+x 4
+y 20
+end
 arch mine2
 x 4
 y 20
@@ -1228,21 +992,12 @@ arch flagstone
 x 4
 y 38
 end
-arch mine2
-x 4
-y 39
-end
 arch blocked
 x 4
 y 39
 end
-arch mine2
-x 4
-y 39
-end
-arch blocked
-x 4
-y 39
+arch dungeon_floor
+x 5
 end
 arch mine2
 x 5
@@ -1339,6 +1094,10 @@ arch blocked
 x 5
 y 11
 end
+arch dungeon_floor
+x 5
+y 12
+end
 arch mine13
 x 5
 y 12
@@ -1375,6 +1134,10 @@ arch blocked
 x 5
 y 19
 end
+arch flagstone
+x 5
+y 20
+end
 arch mine2
 x 5
 y 20
@@ -1471,21 +1234,12 @@ arch flagstone
 x 5
 y 38
 end
-arch mine2
-x 5
-y 39
-end
 arch blocked
 x 5
 y 39
 end
-arch mine2
-x 5
-y 39
-end
-arch blocked
-x 5
-y 39
+arch dungeon_floor
+x 6
 end
 arch mine2
 x 6
@@ -1550,6 +1304,10 @@ arch mine10
 x 6
 y 8
 end
+arch cobblestones
+x 6
+y 9
+end
 arch mine4
 x 6
 y 9
@@ -1563,23 +1321,22 @@ x 6
 y 10
 connected 1
 end
-arch magic_ear
-msg
-@match bernie|barnard
-Click.
-endmsg
-x 6
-y 11
-connected 1
-end
 arch blocked
 x 6
 y 11
 end
+arch dungeon_floor
+x 6
+y 12
+end
 arch mine17
 x 6
 y 12
 end
+arch dungeon_floor
+x 6
+y 13
+end
 arch mine4
 x 6
 y 13
@@ -1620,6 +1377,10 @@ arch blocked
 x 6
 y 19
 end
+arch flagstone
+x 6
+y 20
+end
 arch mine2
 x 6
 y 20
@@ -1720,21 +1481,12 @@ arch mine10
 x 6
 y 38
 end
-arch mine2
-x 6
-y 39
-end
 arch blocked
 x 6
 y 39
 end
-arch mine13
-x 6
-y 39
-end
-arch blocked
-x 6
-y 39
+arch dungeon_floor
+x 7
 end
 arch mine2
 x 7
@@ -1799,6 +1551,10 @@ arch blocked
 x 7
 y 8
 end
+arch cobblestones
+x 7
+y 9
+end
 arch mine13
 x 7
 y 9
@@ -1822,6 +1578,10 @@ arch blocked
 x 7
 y 12
 end
+arch dungeon_floor
+x 7
+y 13
+end
 arch mine13
 x 7
 y 13
@@ -1850,6 +1610,10 @@ arch blocked
 x 7
 y 19
 end
+arch flagstone
+x 7
+y 20
+end
 arch mine2
 x 7
 y 20
@@ -1926,33 +1690,24 @@ arch flagstone
 x 7
 y 37
 end
-arch mine16
-x 7
-y 38
-end
 arch blocked
 x 7
 y 38
 end
-arch mine2
-x 7
-y 39
-end
 arch blocked
 x 7
 y 39
 end
-arch mine13
-x 7
-y 39
-end
-arch blocked
-x 7
-y 39
+arch dungeon_floor
+x 8
 end
 arch mine16
 x 8
 end
+arch dungeon_floor
+x 8
+y 1
+end
 arch mine4
 x 8
 y 1
@@ -2005,6 +1760,10 @@ arch blocked
 x 8
 y 8
 end
+arch cobblestones
+x 8
+y 9
+end
 arch mine13
 x 8
 y 9
@@ -2021,14 +1780,26 @@ arch blocked
 x 8
 y 12
 end
+arch dungeon_floor
+x 8
+y 13
+end
 arch mine17
 x 8
 y 13
 end
+arch dungeon_floor
+x 8
+y 14
+end
 arch mine11
 x 8
 y 14
 end
+arch dungeon_floor
+x 8
+y 15
+end
 arch magic_ear
 msg
 @match is
@@ -2053,10 +1824,6 @@ x 8
 y 16
 connected 4
 end
-arch dungeon_floor
-x 8
-y 17
-end
 arch magic_ear
 msg
 @match he has no daughter
@@ -2067,6 +1834,10 @@ x 8
 y 17
 connected 4
 end
+arch dungeon_floor
+x 8
+y 17
+end
 arch mine10
 x 8
 y 17
@@ -2079,6 +1850,10 @@ arch blocked
 x 8
 y 19
 end
+arch flagstone
+x 8
+y 20
+end
 arch mine2
 x 8
 y 20
@@ -2123,6 +1898,10 @@ arch mine10
 x 8
 y 28
 end
+arch flagstone
+x 8
+y 29
+end
 arch mine4
 x 8
 y 29
@@ -2167,26 +1946,10 @@ arch flagstone
 x 8
 y 37
 end
-arch mine16
-x 8
-y 38
-end
 arch blocked
 x 8
 y 38
 end
-arch mine2
-x 8
-y 39
-end
-arch blocked
-x 8
-y 39
-end
-arch mine13
-x 8
-y 39
-end
 arch blocked
 x 8
 y 39
@@ -2194,6 +1957,10 @@ end
 arch blocked
 x 9
 end
+arch dungeon_floor
+x 9
+y 1
+end
 arch mine13
 x 9
 y 1
@@ -2225,14 +1992,26 @@ arch mine10
 x 9
 y 4
 end
+arch dungeon_floor
+x 9
+y 5
+end
 arch mine11
 x 9
 y 5
 end
+arch dungeon_floor
+x 9
+y 6
+end
 arch mine17
 x 9
 y 6
 end
+arch dungeon_floor
+x 9
+y 7
+end
 arch mine11
 x 9
 y 7
@@ -2241,6 +2020,10 @@ arch blocked
 x 9
 y 8
 end
+arch cobblestones
+x 9
+y 9
+end
 arch mine13
 x 9
 y 9
@@ -2264,30 +2047,10 @@ arch blocked
 x 9
 y 12
 end
-arch mine10
-x 9
-y 12
-end
-arch blocked
-x 9
-y 12
-end
 arch blocked
 x 9
 y 13
 end
-arch mine12
-x 9
-y 13
-end
-arch blocked
-x 9
-y 13
-end
-arch mine14
-x 9
-y 14
-end
 arch blocked
 x 9
 y 14
@@ -2310,6 +2073,10 @@ endmsg
 x 9
 y 16
 end
+arch dungeon_floor
+x 9
+y 16
+end
 arch pit_closed
 hp 11
 sp 26
@@ -2329,10 +2096,18 @@ arch blocked
 x 9
 y 19
 end
+arch flagstone
+x 9
+y 20
+end
 arch mine16
 x 9
 y 20
 end
+arch flagstone
+x 9
+y 21
+end
 arch mine4
 x 9
 y 21
@@ -2365,14 +2140,14 @@ arch flagstone
 x 9
 y 27
 end
-arch mine9
-x 9
-y 28
-end
 arch blocked
 x 9
 y 28
 end
+arch flagstone
+x 9
+y 29
+end
 arch mine13
 x 9
 y 29
@@ -2428,26 +2203,10 @@ arch flagstone
 x 9
 y 37
 end
-arch mine16
-x 9
-y 38
-end
 arch blocked
 x 9
 y 38
 end
-arch mine2
-x 9
-y 39
-end
-arch blocked
-x 9
-y 39
-end
-arch mine13
-x 9
-y 39
-end
 arch blocked
 x 9
 y 39
@@ -2455,6 +2214,10 @@ end
 arch blocked
 x 10
 end
+arch dungeon_floor
+x 10
+y 1
+end
 arch mine17
 x 10
 y 1
@@ -2476,15 +2239,6 @@ x 10
 y 3
 connected 2
 end
-arch magic_ear
-msg
-@match lauretta|laurel
-Click.
-endmsg
-x 10
-y 4
-connected 2
-end
 arch blocked
 x 10
 y 4
@@ -2505,22 +2259,30 @@ arch blocked
 x 10
 y 8
 end
+arch cobblestones
+x 10
+y 9
+end
 arch mine16
 x 10
 y 9
 end
-arch mine11
+arch cobblestones
 x 10
 y 10
 end
 arch mine11
 x 10
-y 11
+y 10
 end
 arch blocked
 x 10
 y 11
 end
+arch dungeon_floor
+x 10
+y 12
+end
 arch mine13
 x 10
 y 12
@@ -2565,14 +2327,14 @@ arch blocked
 x 10
 y 19
 end
-arch mine16
-x 10
-y 20
-end
 arch blocked
 x 10
 y 20
 end
+arch flagstone
+x 10
+y 21
+end
 arch mine13
 x 10
 y 21
@@ -2609,10 +2371,18 @@ arch flagstone
 x 10
 y 28
 end
+arch flagstone
+x 10
+y 29
+end
 arch mine16
 x 10
 y 29
 end
+arch flagstone
+x 10
+y 30
+end
 arch mine4
 x 10
 y 30
@@ -2653,26 +2423,10 @@ arch flagstone
 x 10
 y 37
 end
-arch mine16
-x 10
-y 38
-end
 arch blocked
 x 10
 y 38
 end
-arch mine2
-x 10
-y 39
-end
-arch blocked
-x 10
-y 39
-end
-arch mine13
-x 10
-y 39
-end
 arch blocked
 x 10
 y 39
@@ -2680,6 +2434,10 @@ end
 arch blocked
 x 11
 end
+arch dungeon_floor
+x 11
+y 1
+end
 arch mine13
 x 11
 y 1
@@ -2728,28 +2486,16 @@ arch blocked
 x 11
 y 8
 end
-arch mine9
+arch blocked
 x 11
 y 9
 end
 arch blocked
 x 11
-y 9
-end
-arch mine17
-x 11
 y 10
 end
 arch blocked
 x 11
-y 10
-end
-arch mine14
-x 11
-y 11
-end
-arch blocked
-x 11
 y 11
 end
 arch dungeon_floor
@@ -2808,14 +2554,14 @@ arch blocked
 x 11
 y 19
 end
-arch mine16
-x 11
-y 20
-end
 arch blocked
 x 11
 y 20
 end
+arch flagstone
+x 11
+y 21
+end
 arch mine13
 x 11
 y 21
@@ -2856,10 +2602,6 @@ arch flagstone
 x 11
 y 28
 end
-arch mine9
-x 11
-y 29
-end
 arch blocked
 x 11
 y 29
@@ -2908,26 +2650,10 @@ arch flagstone
 x 11
 y 37
 end
-arch mine9
-x 11
-y 38
-end
 arch blocked
 x 11
 y 38
 end
-arch mine2
-x 11
-y 39
-end
-arch blocked
-x 11
-y 39
-end
-arch mine13
-x 11
-y 39
-end
 arch blocked
 x 11
 y 39
@@ -2935,6 +2661,10 @@ end
 arch blocked
 x 12
 end
+arch dungeon_floor
+x 12
+y 1
+end
 arch mine13
 x 12
 y 1
@@ -2995,6 +2725,10 @@ arch blocked
 x 12
 y 9
 end
+arch dungeon_floor
+x 12
+y 10
+end
 arch mine13
 x 12
 y 10
@@ -3047,10 +2781,6 @@ arch blocked
 x 12
 y 19
 end
-arch mine16
-x 12
-y 20
-end
 arch blocked
 x 12
 y 20
@@ -3151,18 +2881,6 @@ arch flagstone
 x 12
 y 38
 end
-arch mine2
-x 12
-y 39
-end
-arch blocked
-x 12
-y 39
-end
-arch mine2
-x 12
-y 39
-end
 arch blocked
 x 12
 y 39
@@ -3170,10 +2888,18 @@ end
 arch blocked
 x 13
 end
+arch dungeon_floor
+x 13
+y 1
+end
 arch mine17
 x 13
 y 1
 end
+arch dungeon_floor
+x 13
+y 2
+end
 arch mine4
 x 13
 y 2
@@ -3234,10 +2960,6 @@ arch random_food
 x 13
 y 9
 end
-arch dungeon_floor
-x 13
-y 10
-end
 arch magic_ear
 msg
 @match eureca
@@ -3247,6 +2969,10 @@ x 13
 y 10
 connected 3
 end
+arch dungeon_floor
+x 13
+y 10
+end
 arch mine7
 x 13
 y 10
@@ -3311,6 +3037,10 @@ arch blocked
 x 13
 y 19
 end
+arch flagstone
+x 13
+y 20
+end
 arch mine2
 x 13
 y 20
@@ -3411,18 +3141,6 @@ arch flagstone
 x 13
 y 38
 end
-arch mine2
-x 13
-y 39
-end
-arch blocked
-x 13
-y 39
-end
-arch mine2
-x 13
-y 39
-end
 arch blocked
 x 13
 y 39
@@ -3434,6 +3152,10 @@ arch blocked
 x 14
 y 1
 end
+arch dungeon_floor
+x 14
+y 2
+end
 arch mine13
 x 14
 y 2
@@ -3510,10 +3232,6 @@ arch devil
 x 14
 y 8
 end
-arch cobblestones
-x 14
-y 9
-end
 arch magic_mouth
 msg
 He is ..
@@ -3523,6 +3241,10 @@ y 9
 end
 arch cobblestones
 x 14
+y 9
+end
+arch cobblestones
+x 14
 y 10
 end
 arch gate_closed_1
@@ -3590,10 +3312,18 @@ arch blocked
 x 14
 y 19
 end
+arch flagstone
+x 14
+y 20
+end
 arch mine16
 x 14
 y 20
 end
+arch flagstone
+x 14
+y 21
+end
 arch mine4
 x 14
 y 21
@@ -3674,18 +3404,6 @@ arch flagstone
 x 14
 y 38
 end
-arch mine2
-x 14
-y 39
-end
-arch blocked
-x 14
-y 39
-end
-arch mine2
-x 14
-y 39
-end
 arch blocked
 x 14
 y 39
@@ -3829,14 +3547,14 @@ arch blocked
 x 15
 y 19
 end
-arch mine16
-x 15
-y 20
-end
 arch blocked
 x 15
 y 20
 end
+arch flagstone
+x 15
+y 21
+end
 arch mine13
 x 15
 y 21
@@ -3933,18 +3651,6 @@ arch flagstone
 x 15
 y 38
 end
-arch mine2
-x 15
-y 39
-end
-arch blocked
-x 15
-y 39
-end
-arch mine2
-x 15
-y 39
-end
 arch blocked
 x 15
 y 39
@@ -4024,10 +3730,18 @@ arch generate_devil
 x 16
 y 9
 end
+arch dungeon_floor
+x 16
+y 10
+end
 arch mine16
 x 16
 y 10
 end
+arch dungeon_floor
+x 16
+y 11
+end
 arch mine4
 x 16
 y 11
@@ -4087,14 +3801,14 @@ arch blocked
 x 16
 y 19
 end
-arch mine16
-x 16
-y 20
-end
 arch blocked
 x 16
 y 20
 end
+arch flagstone
+x 16
+y 21
+end
 arch mine13
 x 16
 y 21
@@ -4187,25 +3901,20 @@ arch mine10
 x 16
 y 37
 end
+arch flagstone
+x 16
+y 38
+end
 arch mine11
 x 16
 y 38
 end
-arch mine2
-x 16
-y 39
-end
 arch blocked
 x 16
 y 39
 end
-arch mine13
-x 16
-y 39
-end
-arch blocked
-x 16
-y 39
+arch dungeon_floor
+x 17
 end
 arch mine2
 x 17
@@ -4242,6 +3951,10 @@ arch mine10
 x 17
 y 4
 end
+arch dungeon_floor
+x 17
+y 5
+end
 arch mine4
 x 17
 y 5
@@ -4282,10 +3995,18 @@ arch blocked
 x 17
 y 10
 end
+arch dungeon_floor
+x 17
+y 11
+end
 arch mine17
 x 17
 y 11
 end
+arch dungeon_floor
+x 17
+y 12
+end
 arch mine4
 x 17
 y 12
@@ -4330,14 +4051,14 @@ arch blocked
 x 17
 y 19
 end
-arch mine16
-x 17
-y 20
-end
 arch blocked
 x 17
 y 20
 end
+arch flagstone
+x 17
+y 21
+end
 arch mine13
 x 17
 y 21
@@ -4418,37 +4139,20 @@ arch mine10
 x 17
 y 36
 end
-arch mine17
-x 17
-y 37
-end
 arch blocked
 x 17
 y 37
 end
-arch mine17
+arch blocked
 x 17
 y 38
 end
 arch blocked
 x 17
-y 38
-end
-arch mine2
-x 17
 y 39
 end
-arch blocked
-x 17
-y 39
-end
-arch mine13
-x 17
-y 39
-end
-arch blocked
-x 17
-y 39
+arch dungeon_floor
+x 18
 end
 arch mine2
 x 18
@@ -4484,14 +4188,26 @@ arch blocked
 x 18
 y 4
 end
+arch dungeon_floor
+x 18
+y 5
+end
 arch mine17
 x 18
 y 5
 end
+arch dungeon_floor
+x 18
+y 6
+end
 arch mine11
 x 18
 y 6
 end
+arch dungeon_floor
+x 18
+y 7
+end
 arch mine4
 x 18
 y 7
@@ -4520,6 +4236,10 @@ arch blocked
 x 18
 y 11
 end
+arch dungeon_floor
+x 18
+y 12
+end
 arch mine13
 x 18
 y 12
@@ -4568,14 +4288,14 @@ arch blocked
 x 18
 y 19
 end
-arch mine16
-x 18
-y 20
-end
 arch blocked
 x 18
 y 20
 end
+arch flagstone
+x 18
+y 21
+end
 arch mine13
 x 18
 y 21
@@ -4636,53 +4356,40 @@ arch flagstone
 x 18
 y 35
 end
-arch mine16
-x 18
-y 36
-end
 arch blocked
 x 18
 y 36
 end
-arch mine17
+arch blocked
 x 18
 y 37
 end
 arch blocked
 x 18
-y 37
-end
-arch mine17
-x 18
 y 38
 end
 arch blocked
 x 18
-y 38
-end
-arch mine2
-x 18
 y 39
 end
-arch blocked
-x 18
-y 39
-end
-arch mine13
-x 18
-y 39
-end
-arch blocked
-x 18
-y 39
+arch dungeon_floor
+x 19
 end
 arch mine9
 x 19
 end
+arch dungeon_floor
+x 19
+y 1
+end
 arch mine3
 x 19
 y 1
 end
+arch dungeon_floor
+x 19
+y 2
+end
 arch mine3
 x 19
 y 2
@@ -4703,14 +4410,26 @@ arch blocked
 x 19
 y 6
 end
+arch dungeon_floor
+x 19
+y 7
+end
 arch mine9
 x 19
 y 7
 end
+arch dungeon_floor
+x 19
+y 8
+end
 arch mine3
 x 19
 y 8
 end
+arch dungeon_floor
+x 19
+y 9
+end
 arch mine3
 x 19
 y 9
@@ -4723,24 +4442,44 @@ arch blocked
 x 19
 y 11
 end
+arch dungeon_floor
+x 19
+y 12
+end
 arch mine14
 x 19
 y 12
 end
-arch mine3
+arch dungeon_floor
 x 19
 y 13
 end
 arch mine3
 x 19
+y 13
+end
+arch dungeon_floor
+x 19
 y 14
 end
 arch mine3
 x 19
+y 14
+end
+arch dungeon_floor
+x 19
 y 15
 end
 arch mine3
 x 19
+y 15
+end
+arch dungeon_floor
+x 19
+y 16
+end
+arch mine3
+x 19
 y 16
 end
 arch blocked
@@ -4755,111 +4494,143 @@ arch blocked
 x 19
 y 19
 end
-arch mine9
-x 19
-y 20
-end
 arch blocked
 x 19
 y 20
 end
+arch flagstone
+x 19
+y 21
+end
 arch mine14
 x 19
 y 21
 end
-arch mine3
+arch flagstone
 x 19
 y 22
 end
 arch mine3
 x 19
+y 22
+end
+arch flagstone
+x 19
 y 23
 end
 arch mine3
 x 19
+y 23
+end
+arch flagstone
+x 19
 y 24
 end
 arch mine3
 x 19
+y 24
+end
+arch flagstone
+x 19
 y 25
 end
 arch mine3
 x 19
+y 25
+end
+arch flagstone
+x 19
 y 26
 end
 arch mine3
 x 19
+y 26
+end
+arch flagstone
+x 19
 y 27
 end
 arch mine3
 x 19
+y 27
+end
+arch flagstone
+x 19
 y 28
 end
 arch mine3
 x 19
+y 28
+end
+arch flagstone
+x 19
 y 29
 end
 arch mine3
 x 19
+y 29
+end
+arch flagstone
+x 19
 y 30
 end
 arch mine3
 x 19
+y 30
+end
+arch flagstone
+x 19
 y 31
 end
 arch mine3
 x 19
+y 31
+end
+arch flagstone
+x 19
 y 32
 end
 arch mine3
 x 19
+y 32
+end
+arch flagstone
+x 19
 y 33
 end
 arch mine3
 x 19
+y 33
+end
+arch flagstone
+x 19
 y 34
 end
 arch mine3
 x 19
+y 34
+end
+arch flagstone
+x 19
 y 35
 end
-arch mine14
+arch mine3
 x 19
-y 36
+y 35
 end
 arch blocked
 x 19
 y 36
 end
-arch mine14
-x 19
-y 37
-end
 arch blocked
 x 19
 y 37
 end
-arch mine14
+arch blocked
 x 19
 y 38
 end
 arch blocked
 x 19
-y 38
-end
-arch mine12
-x 19
-y 39
-end
-arch blocked
-x 19
-y 39
-end
-arch mine12
-x 19
-y 39
-end
-arch blocked
-x 19
 y 39
 end