diff --git a/scorn/misc/gatehouse b/scorn/misc/gatehouse
index 16fc0c2c9..67305e35d 100644
--- a/scorn/misc/gatehouse
+++ b/scorn/misc/gatehouse
@@ -34,7 +34,7 @@ sp 37
 invisible 1
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 y 5
 end
 arch exit
@@ -44,7 +44,7 @@ sp 37
 invisible 1
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 y 6
 end
 arch exit
@@ -54,7 +54,7 @@ sp 37
 invisible 1
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 y 7
 end
 arch exit
@@ -64,7 +64,7 @@ sp 37
 invisible 1
 y 8
 end
-arch dungeon_floor
+arch cobblestones2
 y 8
 end
 arch flagstone
@@ -101,19 +101,19 @@ arch flagstone
 x 1
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 1
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 1
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 1
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 1
 y 8
 end
@@ -189,7 +189,7 @@ unaggressive 0
 x 2
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 2
 y 5
 end
@@ -205,7 +205,7 @@ connected 14
 x 2
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 2
 y 6
 end
@@ -221,7 +221,7 @@ connected 14
 x 2
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 2
 y 7
 end
@@ -237,7 +237,7 @@ connected 14
 x 2
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 2
 y 8
 end
@@ -294,7 +294,7 @@ arch flagstone
 x 3
 y 1
 end
-arch mine10
+arch mine_2_2_2
 x 3
 y 1
 end
@@ -302,7 +302,7 @@ arch cobblestones
 x 3
 y 2
 end
-arch mine3
+arch mine_2_1_1
 x 3
 y 2
 end
@@ -310,7 +310,7 @@ arch cobblestones
 x 3
 y 3
 end
-arch mine3
+arch mine_2_1_1
 x 3
 y 3
 end
@@ -318,11 +318,11 @@ arch cobblestones
 x 3
 y 4
 end
-arch mine4
+arch mine_2_2_1
 x 3
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 3
 y 5
 end
@@ -332,7 +332,7 @@ connected 10
 x 3
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 3
 y 6
 end
@@ -342,7 +342,7 @@ connected 10
 x 3
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 3
 y 7
 end
@@ -352,7 +352,7 @@ connected 10
 x 3
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 3
 y 8
 end
@@ -366,7 +366,7 @@ arch flagstone
 x 3
 y 9
 end
-arch mine10
+arch mine_2_2_2
 x 3
 y 9
 end
@@ -374,7 +374,7 @@ arch cobblestones
 x 3
 y 10
 end
-arch mine3
+arch mine_2_1_1
 x 3
 y 10
 end
@@ -382,7 +382,7 @@ arch cobblestones
 x 3
 y 11
 end
-arch mine3
+arch mine_2_1_1
 x 3
 y 11
 end
@@ -390,7 +390,7 @@ arch cobblestones
 x 3
 y 12
 end
-arch mine4
+arch mine_2_2_1
 x 3
 y 12
 end
@@ -405,7 +405,7 @@ arch cobblestones
 x 4
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 4
 y 1
 end
@@ -425,23 +425,23 @@ arch cobblestones
 x 4
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 4
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 4
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 4
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 4
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 4
 y 8
 end
@@ -478,7 +478,7 @@ arch cobblestones
 x 4
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 4
 y 9
 end
@@ -498,7 +498,7 @@ arch cobblestones
 x 4
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 4
 y 12
 end
@@ -513,7 +513,7 @@ arch cobblestones
 x 5
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 5
 y 1
 end
@@ -537,23 +537,23 @@ arch cobblestones
 x 5
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 5
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 5
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 5
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 5
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 5
 y 8
 end
@@ -566,7 +566,7 @@ arch cobblestones
 x 5
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 5
 y 9
 end
@@ -590,7 +590,7 @@ arch cobblestones
 x 5
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 5
 y 12
 end
@@ -605,7 +605,7 @@ arch cobblestones
 x 6
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 6
 y 1
 end
@@ -617,31 +617,27 @@ arch cobblestones
 x 6
 y 3
 end
-arch mine8
-x 6
-y 3
-end
 arch cobblestones
 x 6
 y 4
 end
-arch mine12
+arch mine_1_3
 x 6
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 6
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 6
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 6
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 6
 y 8
 end
@@ -649,7 +645,7 @@ arch cobblestones
 x 6
 y 9
 end
-arch mine9
+arch mine_1_3
 x 6
 y 9
 end
@@ -657,10 +653,6 @@ arch cobblestones
 x 6
 y 10
 end
-arch mine5
-x 6
-y 10
-end
 arch cobblestones
 x 6
 y 11
@@ -669,7 +661,7 @@ arch cobblestones
 x 6
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 6
 y 12
 end
@@ -680,7 +672,7 @@ end
 arch dungeon_magic
 x 7
 end
-arch mine11
+arch mine_1_1
 x 7
 end
 arch dungeon_magic
@@ -691,7 +683,7 @@ arch cobblestones
 x 7
 y 1
 end
-arch mine2
+arch mine_3_1
 x 7
 y 1
 end
@@ -707,19 +699,19 @@ arch cobblestones
 x 7
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 7
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 7
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 7
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 7
 y 8
 end
@@ -743,7 +735,7 @@ arch cobblestones
 x 7
 y 12
 end
-arch mine9
+arch mine_3_3
 x 7
 y 12
 end
@@ -751,7 +743,7 @@ arch dungeon_magic
 x 7
 y 13
 end
-arch mine11
+arch mine_1_2
 x 7
 y 13
 end
@@ -774,7 +766,7 @@ arch cobblestones
 x 8
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 8
 y 1
 end
@@ -794,23 +786,23 @@ arch cobblestones
 x 8
 y 4
 end
-arch mine6
+arch mine_1_4
 x 8
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 8
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 8
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 8
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 8
 y 8
 end
@@ -822,7 +814,7 @@ arch cobblestones
 x 8
 y 9
 end
-arch mine6
+arch mine_1_4
 x 8
 y 9
 end
@@ -846,7 +838,7 @@ arch cobblestones
 x 8
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 8
 y 12
 end
@@ -889,7 +881,7 @@ arch cobblestones
 x 9
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 9
 y 1
 end
@@ -909,23 +901,23 @@ arch cobblestones
 x 9
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 9
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 9
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 9
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 9
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 9
 y 8
 end
@@ -933,7 +925,7 @@ arch cobblestones
 x 9
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 9
 y 9
 end
@@ -968,7 +960,7 @@ arch cobblestones
 x 9
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 9
 y 12
 end
@@ -1012,7 +1004,7 @@ arch cobblestones
 x 10
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 10
 y 1
 end
@@ -1040,23 +1032,23 @@ arch cobblestones
 x 10
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 10
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 10
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 10
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 10
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 10
 y 8
 end
@@ -1064,7 +1056,7 @@ arch cobblestones
 x 10
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 10
 y 9
 end
@@ -1105,7 +1097,7 @@ arch cobblestones
 x 10
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 10
 y 12
 end
@@ -1126,7 +1118,7 @@ end
 arch dungeon_magic
 x 11
 end
-arch mine3
+arch mine_1_1
 x 11
 end
 arch dungeon_magic
@@ -1137,7 +1129,7 @@ arch cobblestones
 x 11
 y 1
 end
-arch mine2
+arch mine_3_1
 x 11
 y 1
 end
@@ -1153,23 +1145,23 @@ arch cobblestones
 x 11
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 11
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 11
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 11
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 11
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 11
 y 8
 end
@@ -1177,7 +1169,7 @@ arch cobblestones
 x 11
 y 9
 end
-arch mine16
+arch mine_3_3
 x 11
 y 9
 end
@@ -1185,7 +1177,7 @@ arch cobblestones
 x 11
 y 10
 end
-arch mine3
+arch mine_2_1_1
 x 11
 y 10
 end
@@ -1193,7 +1185,7 @@ arch cobblestones
 x 11
 y 11
 end
-arch mine3
+arch mine_2_1_1
 x 11
 y 11
 end
@@ -1205,7 +1197,7 @@ arch cobblestones
 x 11
 y 12
 end
-arch mine13
+arch mine_4
 x 11
 y 12
 end
@@ -1213,7 +1205,7 @@ arch dungeon_magic
 x 11
 y 13
 end
-arch mine3
+arch mine_1_2
 x 11
 y 13
 end
@@ -1238,7 +1230,7 @@ arch cobblestones
 x 12
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 12
 y 1
 end
@@ -1258,23 +1250,23 @@ arch cobblestones
 x 12
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 12
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 12
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 12
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 12
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 12
 y 8
 end
@@ -1282,7 +1274,7 @@ arch cobblestones
 x 12
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 12
 y 9
 end
@@ -1314,7 +1306,7 @@ arch cobblestones
 x 12
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 12
 y 12
 end
@@ -1343,7 +1335,7 @@ arch cobblestones
 x 13
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 13
 y 1
 end
@@ -1363,11 +1355,11 @@ arch cobblestones
 x 13
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 13
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 13
 y 5
 end
@@ -1375,15 +1367,15 @@ arch lamppost
 x 13
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 13
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 13
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 13
 y 8
 end
@@ -1411,7 +1403,7 @@ arch cobblestones
 x 13
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 13
 y 12
 end
@@ -1440,7 +1432,7 @@ arch cobblestones
 x 14
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 14
 y 1
 end
@@ -1460,23 +1452,23 @@ arch cobblestones
 x 14
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 14
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 14
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 14
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 14
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 14
 y 8
 end
@@ -1500,7 +1492,7 @@ arch cobblestones
 x 14
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 14
 y 12
 end
@@ -1532,7 +1524,7 @@ arch cobblestones
 x 15
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 15
 y 1
 end
@@ -1548,23 +1540,23 @@ arch cobblestones
 x 15
 y 4
 end
-arch mine2
+arch mine_1_3
 x 15
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 15
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 15
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 15
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 15
 y 8
 end
@@ -1572,7 +1564,7 @@ arch cobblestones
 x 15
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 15
 y 9
 end
@@ -1610,7 +1602,7 @@ arch cobblestones
 x 15
 y 12
 end
-arch mine2
+arch mine_2_1_2
 x 15
 y 12
 end
@@ -1640,7 +1632,7 @@ arch cobblestones
 x 16
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 16
 y 1
 end
@@ -1669,23 +1661,19 @@ arch cobblestones
 x 16
 y 4
 end
-arch mine2
-x 16
-y 4
-end
-arch dungeon_floor
+arch cobblestones2
 x 16
 y 5
 end
-arch dungeon_floor
+arch cobblestones2
 x 16
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 16
 y 7
 end
-arch dungeon_floor
+arch cobblestones2
 x 16
 y 8
 end
@@ -1693,7 +1681,7 @@ arch cobblestones
 x 16
 y 9
 end
-arch mine16
+arch mine_3_3
 x 16
 y 9
 end
@@ -1701,7 +1689,7 @@ arch cobblestones
 x 16
 y 10
 end
-arch mine3
+arch mine_2_1_1
 x 16
 y 10
 end
@@ -1709,7 +1697,7 @@ arch cobblestones
 x 16
 y 11
 end
-arch mine3
+arch mine_2_1_1
 x 16
 y 11
 end
@@ -1721,7 +1709,7 @@ arch cobblestones
 x 16
 y 12
 end
-arch mine13
+arch mine_3_1
 x 16
 y 12
 end
@@ -1743,7 +1731,7 @@ end
 arch dungeon_magic
 x 17
 end
-arch mine3
+arch mine_1_1
 x 17
 end
 arch dungeon_magic
@@ -1754,7 +1742,7 @@ arch cobblestones
 x 17
 y 1
 end
-arch mine2
+arch mine_3_1
 x 17
 y 1
 end
@@ -1774,27 +1762,28 @@ arch cobblestones
 x 17
 y 4
 end
-arch mine2
+arch mine_1_4
 x 17
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 17
 y 5
 end
-arch dungeon_floor
+arch trigger
+connected 21
+x 17
+y 5
+end
+arch cobblestones2
 x 17
 y 6
 end
-arch dungeon_floor
+arch cobblestones2
 x 17
 y 7
 end
-arch dungeon_floor
-x 17
-y 8
-end
-arch lamppost
+arch cobblestones2
 x 17
 y 8
 end
@@ -1802,7 +1791,7 @@ arch cobblestones
 x 17
 y 9
 end
-arch mine2
+arch mine_2_1_2
 x 17
 y 9
 end
@@ -1822,7 +1811,7 @@ arch cobblestones
 x 17
 y 12
 end
-arch mine2
+arch mine_3_3
 x 17
 y 12
 end
@@ -1830,7 +1819,7 @@ arch dungeon_magic
 x 17
 y 13
 end
-arch mine3
+arch mine_1_2
 x 17
 y 13
 end
@@ -1853,7 +1842,7 @@ arch cobblestones
 x 18
 y 1
 end
-arch mine2
+arch mine_2_1_2
 x 18
 y 1
 end
@@ -1873,484 +1862,14 @@ arch cobblestones
 x 18
 y 4
 end
-arch mine2
+arch mine_2_1_2
 x 18
 y 4
 end
-arch dungeon_floor
+arch cobblestones2
 x 18
 y 5
 end
-arch dungeon_floor
-x 18
-y 6
-end
-arch dungeon_floor
-x 18
-y 7
-end
-arch dungeon_floor
-x 18
-y 8
-end
-arch cobblestones
-x 18
-y 9
-end
-arch mine2
-x 18
-y 9
-end
-arch cobblestones
-x 18
-y 10
-end
-arch cobblestones
-x 18
-y 11
-end
-arch dungeon_magic
-x 18
-y 12
-end
-arch cobblestones
-x 18
-y 12
-end
-arch mine2
-x 18
-y 12
-end
-arch dungeon_magic
-x 18
-y 13
-end
-arch button_small
-connected 20
-x 18
-y 13
-end
-arch gateTrg1
-connected 24
-x 18
-y 13
-end
-arch dungeon_magic
-x 19
-end
-arch button_small
-face button_sma.112
-value 1
-connected 25
-x 19
-end
-arch spikes_open
-speed 0.500000
-connected 25
-x 19
-end
-arch boulder
-x 19
-end
-arch dungeon_magic
-x 19
-y 1
-end
-arch cobblestones
-x 19
-y 1
-end
-arch mine2
-x 19
-y 1
-end
-arch cobblestones
-x 19
-y 2
-end
-arch cobblestones
-x 19
-y 3
-end
-arch cobblestones
-x 19
-y 4
-end
-arch mine7
-x 19
-y 4
-end
-arch dungeon_floor
-x 19
-y 5
-end
-arch dungeon_floor
-x 19
-y 6
-end
-arch dungeon_floor
-x 19
-y 7
-end
-arch dungeon_floor
-x 19
-y 8
-end
-arch cobblestones
-x 19
-y 9
-end
-arch mine7
-x 19
-y 9
-end
-arch cobblestones
-x 19
-y 10
-end
-arch cobblestones
-x 19
-y 11
-end
-arch dungeon_magic
-x 19
-y 12
-end
-arch cobblestones
-x 19
-y 12
-end
-arch mine2
-x 19
-y 12
-end
-arch dungeon_magic
-x 19
-y 13
-end
-arch button_small
-face button_sma.112
-value 1
-connected 26
-x 19
-y 13
-end
-arch spikes_open
-speed 0.500000
-connected 26
-x 19
-y 13
-end
-arch boulder
-x 19
-y 13
-end
-arch dungeon_magic
-x 20
-end
-arch button_small
-connected 20
-x 20
-end
-arch gateTrg1
-connected 21
-x 20
-end
-arch dungeon_magic
-x 20
-y 1
-end
-arch cobblestones
-x 20
-y 1
-end
-arch mine2
-x 20
-y 1
-end
-arch cobblestones
-x 20
-y 2
-end
-arch cobblestones
-x 20
-y 3
-end
-arch cobblestones
-x 20
-y 4
-end
-arch dungeon_floor
-x 20
-y 5
-end
-arch dungeon_floor
-x 20
-y 6
-end
-arch dungeon_floor
-x 20
-y 7
-end
-arch dungeon_floor
-x 20
-y 8
-end
-arch cobblestones
-x 20
-y 9
-end
-arch cobblestones
-x 20
-y 10
-end
-arch cobblestones
-x 20
-y 11
-end
-arch light3
-x 20
-y 11
-end
-arch dungeon_magic
-x 20
-y 12
-end
-arch cobblestones
-x 20
-y 12
-end
-arch mine2
-x 20
-y 12
-end
-arch dungeon_magic
-x 20
-y 13
-end
-arch button_small
-connected 20
-x 20
-y 13
-end
-arch gateTrg1
-connected 23
-x 20
-y 13
-end
-arch dungeon_magic
-x 21
-end
-arch mine11
-x 21
-end
-arch dungeon_magic
-x 21
-y 1
-end
-arch cobblestones
-x 21
-y 1
-end
-arch mine2
-x 21
-y 1
-end
-arch cobblestones
-x 21
-y 2
-end
-arch cobblestones
-x 21
-y 3
-end
-arch mine8
-x 21
-y 3
-end
-arch cobblestones
-x 21
-y 4
-end
-arch mine4
-x 21
-y 4
-end
-arch dungeon_floor
-x 21
-y 5
-end
-arch lamppost
-x 21
-y 5
-end
-arch dungeon_floor
-x 21
-y 6
-end
-arch dungeon_floor
-x 21
-y 7
-end
-arch dungeon_floor
-x 21
-y 8
-end
-arch cobblestones
-x 21
-y 9
-end
-arch mine10
-x 21
-y 9
-end
-arch cobblestones
-x 21
-y 10
-end
-arch mine5
-x 21
-y 10
-end
-arch cobblestones
-x 21
-y 11
-end
-arch dungeon_magic
-x 21
-y 12
-end
-arch cobblestones
-x 21
-y 12
-end
-arch mine9
-x 21
-y 12
-end
-arch dungeon_magic
-x 21
-y 13
-end
-arch mine11
-x 21
-y 13
-end
-arch brush
-x 22
-end
-arch cobblestones
-x 22
-y 1
-end
-arch mine2
-x 22
-y 1
-end
-arch cobblestones
-x 22
-y 2
-end
-arch cobblestones
-x 22
-y 3
-end
-arch cobblestones
-x 22
-y 4
-end
-arch mine2
-x 22
-y 4
-end
-arch dungeon_floor
-x 22
-y 5
-end
-arch trigger
-connected 21
-x 22
-y 5
-end
-arch dungeon_floor
-x 22
-y 6
-end
-arch dungeon_floor
-x 22
-y 7
-end
-arch dungeon_floor
-x 22
-y 8
-end
-arch cobblestones
-x 22
-y 9
-end
-arch mine2
-x 22
-y 9
-end
-arch cobblestones
-x 22
-y 10
-end
-arch random_weapon
-x 22
-y 10
-end
-arch cobblestones
-x 22
-y 11
-end
-arch random_shield
-x 22
-y 11
-end
-arch cobblestones
-x 22
-y 12
-end
-arch mine2
-x 22
-y 12
-end
-arch brush
-x 22
-y 13
-end
-arch brush
-x 23
-end
-arch cobblestones
-x 23
-y 1
-end
-arch mine2
-x 23
-y 1
-end
-arch cobblestones
-x 23
-y 2
-end
-arch cobblestones
-x 23
-y 3
-end
-arch cobblestones
-x 23
-y 4
-end
-arch mine2
-x 23
-y 4
-end
-arch dungeon_floor
-x 23
-y 5
-end
 arch guard
 name gatehouse guard
 msg
@@ -2377,205 +1896,262 @@ Have you seen any monsters lately?
 endmsg
 friendly 1
 unaggressive 0
-x 23
+x 18
 y 5
 end
-arch dungeon_floor
-x 23
+arch cobblestones2
+x 18
 y 6
 end
-arch dungeon_floor
-x 23
+arch cobblestones2
+x 18
 y 7
 end
-arch dungeon_floor
-x 23
+arch cobblestones2
+x 18
 y 8
 end
-arch cobblestones
-x 23
-y 9
-end
-arch mine2
-x 23
-y 9
-end
-arch cobblestones
-x 23
-y 10
-end
-arch random_shield
-x 23
-y 10
-end
-arch cobblestones
-x 23
-y 11
-end
-arch random_weapon
-x 23
-y 11
-end
-arch cobblestones
-x 23
-y 12
-end
-arch mine2
-x 23
-y 12
-end
-arch brush
-x 23
-y 13
-end
-arch brush
-x 24
-end
-arch cobblestones
-x 24
-y 1
-end
-arch mine9
-x 24
-y 1
-end
-arch cobblestones
-x 24
-y 2
-end
-arch mine3
-x 24
-y 2
-end
-arch cobblestones
-x 24
-y 3
-end
-arch mine3
-x 24
-y 3
-end
-arch medium_stones
-x 24
-y 4
-end
-arch mine12
-x 24
-y 4
-end
-arch dungeon_floor
-x 24
-y 5
-end
-arch grate_closed_2
-speed 0.500000
-connected 20
-x 24
-y 5
-end
-arch dungeon_floor
-x 24
-y 6
-end
-arch grate_closed_2
-speed 0.500000
-connected 20
-x 24
-y 6
-end
-arch dungeon_floor
-x 24
-y 7
-end
-arch grate_closed_2
-speed 0.500000
-connected 20
-x 24
-y 7
-end
-arch dungeon_floor
-x 24
-y 8
-end
-arch grate_closed_2
-speed 0.500000
-connected 20
-x 24
-y 8
-end
-arch cobblestones
-x 24
-y 9
-end
-arch mine9
-x 24
-y 9
-end
-arch cobblestones
-x 24
-y 10
-end
-arch mine3
-x 24
-y 10
-end
-arch cobblestones
-x 24
-y 11
-end
-arch mine3
-x 24
-y 11
-end
-arch brush
-x 24
-y 12
-end
-arch mine12
-x 24
-y 12
-end
-arch brush
-x 24
-y 13
-end
-arch brush
-x 25
-end
-arch brush
-x 25
-y 1
-end
-arch medium_stones
-x 25
-y 2
-end
-arch medium_stones
-x 25
-y 3
-end
 arch lamppost
-x 25
+x 18
+y 8
+end
+arch cobblestones
+x 18
+y 9
+end
+arch mine_2_1_2
+x 18
+y 9
+end
+arch cobblestones
+x 18
+y 10
+end
+arch cobblestones
+x 18
+y 11
+end
+arch dungeon_magic
+x 18
+y 12
+end
+arch cobblestones
+x 18
+y 12
+end
+arch mine_2_1_2
+x 18
+y 12
+end
+arch dungeon_magic
+x 18
+y 13
+end
+arch button_small
+connected 20
+x 18
+y 13
+end
+arch gateTrg1
+connected 24
+x 18
+y 13
+end
+arch dungeon_magic
+x 19
+end
+arch button_small
+face button_sma.112
+value 1
+connected 25
+x 19
+end
+arch spikes_open
+speed 0.500000
+connected 25
+x 19
+end
+arch boulder
+x 19
+end
+arch dungeon_magic
+x 19
+y 1
+end
+arch cobblestones
+x 19
+y 1
+end
+arch mine_2_1_2
+x 19
+y 1
+end
+arch cobblestones
+x 19
+y 2
+end
+arch cobblestones
+x 19
 y 3
 end
-arch medium_stones
-x 25
+arch cobblestones
+x 19
 y 4
 end
-arch dungeon_floor
-x 25
+arch mine_2_1_2
+x 19
+y 4
+end
+arch cobblestones2
+x 19
+y 5
+end
+arch grate_closed_2
+speed 0.500000
+connected 20
+x 19
+y 5
+end
+arch cobblestones2
+x 19
+y 6
+end
+arch grate_closed_2
+speed 0.500000
+connected 20
+x 19
+y 6
+end
+arch cobblestones2
+x 19
+y 7
+end
+arch grate_closed_2
+speed 0.500000
+connected 20
+x 19
+y 7
+end
+arch cobblestones2
+x 19
+y 8
+end
+arch grate_closed_2
+speed 0.500000
+connected 20
+x 19
+y 8
+end
+arch cobblestones
+x 19
+y 9
+end
+arch mine_2_1_2
+x 19
+y 9
+end
+arch cobblestones
+x 19
+y 10
+end
+arch random_weapon
+x 19
+y 10
+end
+arch cobblestones
+x 19
+y 11
+end
+arch random_shield
+x 19
+y 11
+end
+arch dungeon_magic
+x 19
+y 12
+end
+arch cobblestones
+x 19
+y 12
+end
+arch mine_2_1_2
+x 19
+y 12
+end
+arch dungeon_magic
+x 19
+y 13
+end
+arch button_small
+face button_sma.112
+value 1
+connected 26
+x 19
+y 13
+end
+arch spikes_open
+speed 0.500000
+connected 26
+x 19
+y 13
+end
+arch boulder
+x 19
+y 13
+end
+arch dungeon_magic
+x 20
+end
+arch button_small
+connected 20
+x 20
+end
+arch gateTrg1
+connected 21
+x 20
+end
+arch dungeon_magic
+x 20
+y 1
+end
+arch cobblestones
+x 20
+y 1
+end
+arch mine_2_1_2
+x 20
+y 1
+end
+arch cobblestones
+x 20
+y 2
+end
+arch cobblestones
+x 20
+y 3
+end
+arch cobblestones
+x 20
+y 4
+end
+arch mine_2_1_2
+x 20
+y 4
+end
+arch cobblestones2
+x 20
 y 5
 end
 arch check_floor
 slaying gate_pass
 connected 23
-x 25
+x 20
 y 5
 end
 arch check_floor
 slaying hero_of_scorn
 connected 24
-x 25
+x 20
 y 5
 end
 arch magic_ear
@@ -2585,59 +2161,283 @@ Well, you know the password,
 so you must be ok.   Pass Friend.
 endmsg
 connected 21
-x 25
+x 20
 y 5
 end
-arch dungeon_floor
-x 25
+arch cobblestones2
+x 20
 y 6
 end
 arch check_floor
 slaying gate_pass
 connected 23
-x 25
+x 20
 y 6
 end
 arch check_floor
 slaying hero_of_scorn
 connected 24
-x 25
+x 20
 y 6
 end
-arch dungeon_floor
-x 25
+arch cobblestones2
+x 20
 y 7
 end
 arch check_floor
 slaying gate_pass
 connected 23
-x 25
+x 20
 y 7
 end
 arch check_floor
 slaying hero_of_scorn
 connected 24
-x 25
+x 20
 y 7
 end
-arch dungeon_floor
-x 25
+arch cobblestones2
+x 20
 y 8
 end
 arch check_floor
 slaying gate_pass
 connected 23
-x 25
+x 20
 y 8
 end
 arch check_floor
 slaying hero_of_scorn
 connected 24
-x 25
+x 20
 y 8
 end
-arch medium_stones
-x 25
+arch cobblestones
+x 20
+y 9
+end
+arch mine_2_1_2
+x 20
+y 9
+end
+arch cobblestones
+x 20
+y 10
+end
+arch random_shield
+x 20
+y 10
+end
+arch cobblestones
+x 20
+y 11
+end
+arch random_weapon
+x 20
+y 11
+end
+arch dungeon_magic
+x 20
+y 12
+end
+arch cobblestones
+x 20
+y 12
+end
+arch mine_2_1_2
+x 20
+y 12
+end
+arch dungeon_magic
+x 20
+y 13
+end
+arch button_small
+connected 20
+x 20
+y 13
+end
+arch gateTrg1
+connected 23
+x 20
+y 13
+end
+arch dungeon_floor
+x 21
+end
+arch dungeon_magic
+x 21
+end
+arch dwall_2_2_2
+x 21
+end
+arch mine_1_1
+x 21
+end
+arch dungeon_magic
+x 21
+y 1
+end
+arch dungeon_floor
+x 21
+y 1
+end
+arch dwall_3_2
+x 21
+y 1
+end
+arch mine_3_4
+x 21
+y 1
+end
+arch dungeon_floor
+x 21
+y 2
+end
+arch dwall_2_2_1
+x 21
+y 2
+end
+arch mine_2_1_1
+x 21
+y 2
+end
+arch dungeon_floor
+x 21
+y 3
+end
+arch mine_2_1_1
+x 21
+y 3
+end
+arch dungeon_floor
+x 21
+y 4
+end
+arch mine_2_2_4
+x 21
+y 4
+end
+arch cobblestones
+x 21
+y 5
+end
+arch cobblestones
+x 21
+y 6
+end
+arch cobblestones
+x 21
+y 7
+end
+arch cobblestones
+x 21
+y 8
+end
+arch cobblestones
+x 21
+y 9
+end
+arch mine_2_2_3
+x 21
+y 9
+end
+arch cobblestones
+x 21
+y 10
+end
+arch mine_1_2
+x 21
+y 10
+end
+arch cobblestones
+x 21
+y 11
+end
+arch door_1
+x 21
+y 11
+end
+arch dungeon_magic
+x 21
+y 12
+end
+arch cobblestones
+x 21
+y 12
+end
+arch dwall_2_2_2
+x 21
+y 12
+end
+arch mine_2_2_3
+x 21
+y 12
+end
+arch dungeon_floor
+x 21
+y 13
+end
+arch dungeon_magic
+x 21
+y 13
+end
+arch dwall_2_2_1
+x 21
+y 13
+end
+arch mine_1_2
+x 21
+y 13
+end
+arch flagstone
+x 22
+end
+arch dwall_2_2_3
+x 22
+end
+arch flagstone
+x 22
+y 1
+end
+arch dwall_4
+x 22
+y 1
+end
+arch flagstone
+x 22
+y 2
+end
+arch dwall_3_1
+x 22
+y 2
+end
+arch flagstone
+x 22
+y 3
+end
+arch flagstone
+x 22
+y 4
+end
+arch cobblestones
+x 22
+y 5
+end
+arch cobblestones
+x 22
+y 6
+end
+arch cobblestones
+x 22
+y 7
+end
+arch cobblestones
+x 22
+y 8
+end
+arch flagstone
+x 22
 y 9
 end
 arch guard
@@ -2667,157 +2467,283 @@ endmsg
 speed_left -0.520000
 friendly 1
 unaggressive 0
-x 25
+x 22
 y 9
 end
-arch medium_stones
-x 25
+arch flagstone
+x 22
 y 10
 end
+arch flagstone
+x 22
+y 11
+end
+arch flagstone
+x 22
+y 12
+end
+arch dwall_3_3
+x 22
+y 12
+end
+arch flagstone
+x 22
+y 13
+end
+arch dwall_2_2_4
+x 22
+y 13
+end
+arch brush
+x 23
+end
+arch flagstone
+x 23
+y 1
+end
+arch dwall_2_2_3
+x 23
+y 1
+end
+arch flagstone
+x 23
+y 2
+end
+arch dwall_3_1
+x 23
+y 2
+end
+arch flagstone
+x 23
+y 3
+end
+arch flagstone
+x 23
+y 4
+end
+arch cobblestones
+x 23
+y 5
+end
+arch cobblestones
+x 23
+y 6
+end
+arch cobblestones
+x 23
+y 7
+end
+arch cobblestones
+x 23
+y 8
+end
+arch flagstone
+x 23
+y 9
+end
+arch flagstone
+x 23
+y 10
+end
+arch flagstone
+x 23
+y 11
+end
+arch dwall_2_2_2
+x 23
+y 11
+end
+arch flagstone
+x 23
+y 12
+end
+arch dwall_2_2_4
+x 23
+y 12
+end
+arch brush
+x 23
+y 13
+end
+arch brush
+x 24
+end
+arch grass
+x 24
+y 1
+end
+arch flagstone
+x 24
+y 2
+end
+arch dwall_2_1_2
+x 24
+y 2
+end
+arch flagstone
+x 24
+y 3
+end
+arch flagstone
+x 24
+y 4
+end
+arch cobblestones
+x 24
+y 5
+end
+arch cobblestones
+x 24
+y 6
+end
+arch cobblestones
+x 24
+y 7
+end
+arch cobblestones
+x 24
+y 8
+end
+arch flagstone
+x 24
+y 9
+end
+arch flagstone
+x 24
+y 10
+end
+arch flagstone
+x 24
+y 11
+end
+arch dwall_2_1_2
+x 24
+y 11
+end
+arch brush
+x 24
+y 12
+end
+arch brush
+x 24
+y 13
+end
+arch brush
+x 25
+end
+arch brush
+x 25
+y 1
+end
+arch flagstone
+x 25
+y 2
+end
+arch dwall_2_2_3
+x 25
+y 2
+end
+arch flagstone
+x 25
+y 3
+end
+arch dwall_1_2
+x 25
+y 3
+end
+arch flagstone
+x 25
+y 4
+end
 arch lamppost
 x 25
-y 10
-end
-arch medium_stones
-x 25
-y 11
-end
-arch brush
-x 25
-y 12
-end
-arch brush
-x 25
-y 13
-end
-arch grass
-x 26
-end
-arch brush
-x 26
-y 1
-end
-arch brush
-x 26
-y 2
-end
-arch medium_stones
-x 26
-y 3
-end
-arch medium_stones
-x 26
 y 4
 end
-arch dungeon_floor
-x 26
+arch cobblestones
+x 25
 y 5
 end
-arch dungeon_floor
-x 26
+arch cobblestones
+x 25
 y 6
 end
-arch dungeon_floor
-x 26
+arch cobblestones
+x 25
 y 7
 end
-arch dungeon_floor
-x 26
+arch cobblestones
+x 25
 y 8
 end
-arch medium_stones
-x 26
+arch flagstone
+x 25
 y 9
 end
-arch grass
-x 26
+arch lamppost
+x 25
+y 9
+end
+arch flagstone
+x 25
 y 10
 end
-arch brush
-x 26
+arch dwall_1_1
+x 25
+y 10
+end
+arch flagstone
+x 25
+y 11
+end
+arch dwall_2_2_4
+x 25
 y 11
 end
 arch brush
-x 26
-y 12
-end
-arch grass
-x 26
+x 25
 y 12
 end
 arch brush
-x 26
+x 25
 y 13
 end
-arch brush
-x 27
-end
 arch grass
-x 27
+x 26
+end
+arch brush
+x 26
 y 1
 end
 arch brush
-x 27
+x 26
 y 2
 end
-arch brush
-x 27
+arch medium_stones
+x 26
 y 3
 end
-arch grass
-x 27
+arch medium_stones
+x 26
 y 4
 end
-arch exit
-slaying /world/world_105_115
-hp 22
-sp 37
-invisible 1
-x 27
+arch cobblestones
+x 26
 y 5
 end
-arch dungeon_floor
-x 27
-y 5
-end
-arch exit
-slaying /world/world_105_115
-hp 22
-sp 37
-invisible 1
-x 27
+arch cobblestones
+x 26
 y 6
 end
-arch dungeon_floor
-x 27
-y 6
-end
-arch exit
-slaying /world/world_105_115
-hp 22
-sp 37
-invisible 1
-x 27
+arch cobblestones
+x 26
 y 7
 end
-arch dungeon_floor
-x 27
-y 7
-end
-arch exit
-slaying /world/world_105_115
-hp 22
-sp 37
-invisible 1
-x 27
+arch cobblestones
+x 26
 y 8
 end
-arch dungeon_floor
-x 27
-y 8
-end
-arch grass
-x 27
+arch medium_stones
+x 26
 y 9
 end
 arch sign
@@ -2826,6 +2752,97 @@ msg
 WARNING: Once beyond the city walls,
 you are on your OWN!
 endmsg
+x 26
+y 9
+end
+arch grass
+x 26
+y 10
+end
+arch brush
+x 26
+y 11
+end
+arch brush
+x 26
+y 12
+end
+arch grass
+x 26
+y 12
+end
+arch brush
+x 26
+y 13
+end
+arch brush
+x 27
+end
+arch grass
+x 27
+y 1
+end
+arch brush
+x 27
+y 2
+end
+arch brush
+x 27
+y 3
+end
+arch grass
+x 27
+y 4
+end
+arch exit
+slaying /world/world_105_115
+hp 22
+sp 37
+invisible 1
+x 27
+y 5
+end
+arch cobblestones
+x 27
+y 5
+end
+arch exit
+slaying /world/world_105_115
+hp 22
+sp 37
+invisible 1
+x 27
+y 6
+end
+arch cobblestones
+x 27
+y 6
+end
+arch exit
+slaying /world/world_105_115
+hp 22
+sp 37
+invisible 1
+x 27
+y 7
+end
+arch cobblestones
+x 27
+y 7
+end
+arch exit
+slaying /world/world_105_115
+hp 22
+sp 37
+invisible 1
+x 27
+y 8
+end
+arch cobblestones
+x 27
+y 8
+end
+arch grass
 x 27
 y 9
 end
diff --git a/world/world_105_115 b/world/world_105_115
index 8da284d3d..71ed14b4c 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -8735,7 +8735,7 @@ elevation 4055
 x 20
 y 36
 end
-arch dwall_2_2_2
+arch cwall_2_2_2
 x 20
 y 36
 end
@@ -8748,17 +8748,13 @@ elevation 4519
 x 20
 y 37
 end
-arch invis_exit
+arch guard_house_1
 slaying /scorn/misc/gatehouse
 hp 1
 sp 7
 x 20
 y 37
 end
-arch guard_house_1
-x 20
-y 37
-end
 arch dungeon_magic
 x 20
 y 38
@@ -8768,7 +8764,7 @@ elevation 5152
 x 20
 y 38
 end
-arch dwall_2_2_1
+arch cwall_2_2_1
 x 20
 y 38
 end
@@ -9204,7 +9200,7 @@ elevation 5108
 x 21
 y 36
 end
-arch cwall_3_4
+arch cwall_4
 x 21
 y 36
 end
@@ -9212,18 +9208,14 @@ arch dungeon_magic
 x 21
 y 37
 end
-arch cobblestones2
+arch guard_house_1
+type 0
+no_pass 1
+is_floor 1
 elevation 5383
 x 21
 y 37
 end
-arch invis_exit
-slaying /scorn/misc/gatehouse
-hp 26
-sp 7
-x 21
-y 37
-end
 arch guard_house_2
 x 21
 y 37
@@ -9237,7 +9229,7 @@ elevation 5341
 x 21
 y 38
 end
-arch cwall_3_4
+arch cwall_4
 x 21
 y 38
 end
@@ -9595,12 +9587,32 @@ arch cobblestones
 x 22
 y 36
 end
-arch cobblestones
+arch cwall_2_2_3
+x 22
+y 36
+end
+arch dungeon_magic
+elevation 5383
 x 22
 y 37
 end
 arch cobblestones
 x 22
+y 37
+end
+arch guard_house_2
+slaying /scorn/misc/gatehouse
+hp 26
+sp 7
+x 22
+y 37
+end
+arch cobblestones
+x 22
+y 38
+end
+arch cwall_2_2_4
+x 22
 y 38
 end
 arch grass