From 88ec2fa62c56081eadb9a26e4fe11f3c0bb760df Mon Sep 17 00:00:00 2001
From: temitchell <temitchell@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 14 Dec 2003 02:44:35 +0000
Subject: [PATCH] - touch up these maps mainly to use new windows now available

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2487 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 darcap/darcap/circus/ghost     | 688 ++++++++++++++-------------------
 darcap/darcap/circus/illusions | 417 ++++++--------------
 darcap/darcap/circus/wurfbude  | 495 ++++++++++++++++--------
 3 files changed, 733 insertions(+), 867 deletions(-)

diff --git a/darcap/darcap/circus/ghost b/darcap/darcap/circus/ghost
index fa77bba3e..c7a92ed03 100644
--- a/darcap/darcap/circus/ghost
+++ b/darcap/darcap/circus/ghost
@@ -5,8 +5,9 @@ Creator: Cater & Wade
 Email: john_cater@yahoo.com
 Date: Thu Jan 28 18:37:06 1999
 endmsg
-x 32
-invisible 2
+width 32
+height 16
+darkness 2
 end
 arch dungeon_floor
 end
@@ -137,10 +138,10 @@ x 1
 y 4
 end
 arch wight
-x 1
-y 4
 unaggressive 1
 stand_still 1
+x 1
+y 4
 end
 arch dungeon_floor
 x 1
@@ -155,10 +156,10 @@ x 1
 y 6
 end
 arch ghost
-x 1
-y 6
 unaggressive 1
 stand_still 1
+x 1
+y 6
 end
 arch dungeon_floor
 x 1
@@ -174,9 +175,9 @@ y 8
 end
 arch mover_2
 maxhp 1
+level 1
 x 1
 y 8
-level 1
 end
 arch dirtfloor
 x 1
@@ -184,9 +185,9 @@ y 9
 end
 arch mover_1
 maxhp 1
+level 1
 x 1
 y 9
-level 1
 end
 arch dirtfloor
 x 1
@@ -194,9 +195,9 @@ y 10
 end
 arch mover_1
 maxhp 1
+level 1
 x 1
 y 10
-level 1
 end
 arch dirtfloor
 x 1
@@ -204,9 +205,9 @@ y 11
 end
 arch mover_1
 maxhp 1
+level 1
 x 1
 y 11
-level 1
 end
 arch dungeon_floor
 x 1
@@ -247,10 +248,10 @@ x 2
 y 1
 end
 arch ghast
-x 2
-y 1
 unaggressive 1
 stand_still 1
+x 2
+y 1
 end
 arch dungeon_floor
 x 2
@@ -265,20 +266,20 @@ x 2
 y 3
 end
 arch wight
-x 2
-y 3
 unaggressive 1
 stand_still 1
+x 2
+y 3
 end
 arch dungeon_floor
 x 2
 y 4
 end
 arch wight
-x 2
-y 4
 unaggressive 1
 stand_still 1
+x 2
+y 4
 end
 arch dungeon_floor
 x 2
@@ -293,10 +294,10 @@ x 2
 y 6
 end
 arch ghost
-x 2
-y 6
 unaggressive 1
 stand_still 1
+x 2
+y 6
 end
 arch dirtfloor
 x 2
@@ -304,10 +305,10 @@ y 7
 end
 arch mover_3
 maxhp 1
-x 2
-y 7
 speed -2.000000
 level 1
+x 2
+y 7
 end
 arch dungeon_floor
 x 2
@@ -322,10 +323,10 @@ x 2
 y 9
 end
 arch ghost
-x 2
-y 9
 unaggressive 1
 stand_still 1
+x 2
+y 9
 end
 arch dungeon_floor
 x 2
@@ -341,18 +342,18 @@ y 11
 end
 arch mover_7
 maxhp 1
+level 1
 x 2
 y 11
-level 1
 end
 arch dirtfloor
 x 2
 y 12
 end
 arch grate_closed_1
+connected 96
 x 2
 y 12
-connected 96
 end
 arch dirtfloor
 x 2
@@ -361,9 +362,9 @@ end
 arch goldfloor
 name drop 30 goldcoins
 food 30
+connected 96
 x 2
 y 13
-connected 96
 end
 arch dirtfloor
 x 2
@@ -392,9 +393,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 3
 y 1
-level 1
 end
 arch dirtfloor
 x 3
@@ -402,9 +403,9 @@ y 2
 end
 arch mover_1
 maxhp 1
+level 1
 x 3
 y 2
-level 1
 end
 arch dirtfloor
 x 3
@@ -412,9 +413,9 @@ y 3
 end
 arch mover_1
 maxhp 1
+level 1
 x 3
 y 3
-level 1
 end
 arch dirtfloor
 x 3
@@ -422,9 +423,9 @@ y 4
 end
 arch mover_1
 maxhp 1
+level 1
 x 3
 y 4
-level 1
 end
 arch dungeon_floor
 x 3
@@ -448,10 +449,10 @@ y 7
 end
 arch mover_3
 maxhp 1
-x 3
-y 7
 speed -2.000000
 level 1
+x 3
+y 7
 end
 arch dungeon_floor
 x 3
@@ -534,10 +535,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 4
-y 1
 speed -2.000000
 level 1
+x 4
+y 1
 end
 arch dungeon_floor
 x 4
@@ -561,9 +562,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 4
 y 4
-level 1
 end
 arch dungeon_floor
 x 4
@@ -578,10 +579,10 @@ x 4
 y 6
 end
 arch wraith
-x 4
-y 6
 unaggressive 1
 stand_still 1
+x 4
+y 6
 end
 arch dirtfloor
 x 4
@@ -589,10 +590,10 @@ y 7
 end
 arch mover_3
 maxhp 1
-x 4
-y 7
 speed -2.000000
 level 1
+x 4
+y 7
 end
 arch dungeon_floor
 x 4
@@ -603,10 +604,10 @@ x 4
 y 9
 end
 arch skeleton
-x 4
-y 9
 unaggressive 1
 stand_still 1
+x 4
+y 9
 end
 arch dungeon_floor
 x 4
@@ -621,10 +622,10 @@ x 4
 y 11
 end
 arch skeleton
-x 4
-y 11
 unaggressive 1
 stand_still 1
+x 4
+y 11
 end
 arch dungeon_floor
 x 4
@@ -670,10 +671,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 5
-y 1
 speed -2.000000
 level 1
+x 5
+y 1
 end
 arch dungeon_floor
 x 5
@@ -688,10 +689,10 @@ x 5
 y 3
 end
 arch ghast
-x 5
-y 3
 unaggressive 1
 stand_still 1
+x 5
+y 3
 end
 arch dirtfloor
 x 5
@@ -699,9 +700,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 5
 y 4
-level 1
 end
 arch dungeon_floor
 x 5
@@ -725,10 +726,10 @@ y 7
 end
 arch mover_3
 maxhp 1
-x 5
-y 7
 speed -2.000000
 level 1
+x 5
+y 7
 end
 arch dungeon_floor
 x 5
@@ -759,10 +760,10 @@ x 5
 y 11
 end
 arch skeleton
-x 5
-y 11
 unaggressive 1
 stand_still 1
+x 5
+y 11
 end
 arch dungeon_floor
 x 5
@@ -778,10 +779,10 @@ y 13
 end
 arch mover_5
 maxhp 1
-x 5
-y 13
 speed -2.000000
 level 1
+x 5
+y 13
 end
 arch dungeon_floor
 x 5
@@ -789,10 +790,10 @@ y 14
 end
 arch mover_3
 maxhp 1
-x 5
-y 14
 speed -2.000000
 level 1
+x 5
+y 14
 end
 arch dungeon_floor
 x 5
@@ -814,10 +815,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 6
-y 1
 speed -2.000000
 level 1
+x 6
+y 1
 end
 arch dungeon_floor
 x 6
@@ -841,9 +842,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 6
 y 4
-level 1
 end
 arch dungeon_floor
 x 6
@@ -867,10 +868,10 @@ y 7
 end
 arch mover_3
 maxhp 1
-x 6
-y 7
 speed -2.000000
 level 1
+x 6
+y 7
 end
 arch dungeon_floor
 x 6
@@ -901,9 +902,9 @@ x 6
 y 11
 end
 arch igateTrg2
+connected 2
 x 6
 y 11
-connected 2
 end
 arch dungeon_floor
 x 6
@@ -919,10 +920,10 @@ y 13
 end
 arch mover_7
 maxhp 1
-x 6
-y 13
 speed -2.000000
 level 1
+x 6
+y 13
 end
 arch dungeon_floor
 x 6
@@ -930,10 +931,10 @@ y 14
 end
 arch mover_3
 maxhp 1
-x 6
-y 14
 speed -2.000000
 level 1
+x 6
+y 14
 end
 arch dungeon_floor
 x 6
@@ -955,20 +956,20 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 7
-y 1
 speed -2.000000
 level 1
+x 7
+y 1
 end
 arch dungeon_floor
 x 7
 y 2
 end
 arch ghast
-x 7
-y 2
 unaggressive 1
 stand_still 1
+x 7
+y 2
 end
 arch dungeon_floor
 x 7
@@ -984,9 +985,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 7
 y 4
-level 1
 end
 arch dungeon_floor
 x 7
@@ -1010,10 +1011,10 @@ y 7
 end
 arch mover_3
 maxhp 1
-x 7
-y 7
 speed -2.000000
 level 1
+x 7
+y 7
 end
 arch dirtfloor
 x 7
@@ -1021,9 +1022,9 @@ y 8
 end
 arch mover_5
 maxhp 1
+level 1
 x 7
 y 8
-level 1
 end
 arch dirtfloor
 x 7
@@ -1031,9 +1032,9 @@ y 9
 end
 arch mover_5
 maxhp 1
+level 1
 x 7
 y 9
-level 1
 end
 arch dirtfloor
 x 7
@@ -1041,25 +1042,25 @@ y 10
 end
 arch mover_5
 maxhp 1
+level 1
 x 7
 y 10
-level 1
 end
 arch dirtfloor
 x 7
 y 11
 end
 arch button_small
-x 7
-y 11
 invisible 1
 connected 2
+x 7
+y 11
 end
 arch mover_5
 maxhp 1
+level 1
 x 7
 y 11
-level 1
 end
 arch dirtfloor
 x 7
@@ -1067,9 +1068,9 @@ y 12
 end
 arch mover_5
 maxhp 1
+level 1
 x 7
 y 12
-level 1
 end
 arch dirtfloor
 x 7
@@ -1077,10 +1078,10 @@ y 13
 end
 arch mover_7
 maxhp 1
+speed -2.000000
+level 1
 x 7
 y 13
-speed -2.000000
-level 1
 end
 arch dirtfloor
 x 7
@@ -1088,9 +1089,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 7
 y 14
-level 1
 end
 arch dungeon_floor
 x 7
@@ -1112,10 +1113,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 8
-y 1
 speed -2.000000
 level 1
+x 8
+y 1
 end
 arch dungeon_floor
 x 8
@@ -1139,9 +1140,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 8
 y 4
-level 1
 end
 arch dungeon_floor
 x 8
@@ -1156,10 +1157,10 @@ x 8
 y 6
 end
 arch grimreaper
-x 8
-y 6
 unaggressive 1
 stand_still 1
+x 8
+y 6
 end
 arch dungeon_floor
 x 8
@@ -1167,9 +1168,9 @@ y 7
 end
 arch mover_6
 maxhp 1
+level 1
 x 8
 y 7
-level 1
 end
 arch dungeon_floor
 x 8
@@ -1184,10 +1185,10 @@ x 8
 y 9
 end
 arch zombie
-x 8
-y 9
 unaggressive 1
 stand_still 1
+x 8
+y 9
 end
 arch dungeon_floor
 x 8
@@ -1202,10 +1203,10 @@ x 8
 y 11
 end
 arch vampire
-x 8
-y 11
 unaggressive 1
 stand_still 1
+x 8
+y 11
 end
 arch dungeon_floor
 x 8
@@ -1220,10 +1221,10 @@ x 8
 y 13
 end
 arch gargolye
-x 8
-y 13
 unaggressive 1
 stand_still 1
+x 8
+y 13
 end
 arch dirtfloor
 x 8
@@ -1231,9 +1232,9 @@ y 14
 end
 arch mover_3
 maxhp 1
-x 8
-y 14
 level 1
+x 8
+y 14
 end
 arch dungeon_floor
 x 8
@@ -1255,10 +1256,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 9
-y 1
 speed -2.000000
 level 1
+x 9
+y 1
 end
 arch dungeon_floor
 x 9
@@ -1273,10 +1274,10 @@ x 9
 y 3
 end
 arch wight
-x 9
-y 3
 unaggressive 1
 stand_still 1
+x 9
+y 3
 end
 arch dirtfloor
 x 9
@@ -1284,9 +1285,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 9
 y 4
-level 1
 end
 arch dungeon_floor
 x 9
@@ -1366,10 +1367,10 @@ y 14
 end
 arch mover_3
 maxhp 1
-x 9
-y 14
 speed -2.000000
 level 1
+x 9
+y 14
 end
 arch dungeon_floor
 x 9
@@ -1391,10 +1392,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 10
-y 1
 speed -2.000000
 level 1
+x 10
+y 1
 end
 arch dungeon_floor
 x 10
@@ -1418,9 +1419,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 10
 y 4
-level 1
 end
 arch dungeon_floor
 x 10
@@ -1491,9 +1492,9 @@ x 10
 y 13
 end
 arch ghost
+stand_still 1
 x 10
 y 13
-stand_still 1
 end
 arch dirtfloor
 x 10
@@ -1501,9 +1502,9 @@ y 14
 end
 arch mover_3
 maxhp 1
-x 10
-y 14
 level 1
+x 10
+y 14
 end
 arch dungeon_floor
 x 10
@@ -1525,26 +1526,26 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 11
-y 1
 speed -2.000000
 level 1
+x 11
+y 1
 end
 arch dungeon_floor
 x 11
 y 2
 end
 arch grimreaper
-x 11
-y 2
 unaggressive 1
 stand_still 1
+x 11
+y 2
 end
 arch dungeon_floor
 x 11
 y 3
 end
-arch wwall_win2
+arch woodwall_win2
 x 11
 y 3
 end
@@ -1554,10 +1555,10 @@ y 4
 end
 arch mover_7
 maxhp 1
-x 11
-y 4
 speed -2.000000
 level 1
+x 11
+y 4
 end
 arch dungeon_floor
 x 11
@@ -1628,9 +1629,9 @@ x 11
 y 13
 end
 arch ghost
+stand_still 1
 x 11
 y 13
-stand_still 1
 end
 arch dirtfloor
 x 11
@@ -1638,9 +1639,9 @@ y 14
 end
 arch mover_3
 maxhp 1
-x 11
-y 14
 level 1
+x 11
+y 14
 end
 arch dungeon_floor
 x 11
@@ -1662,10 +1663,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 12
-y 1
 speed -2.000000
 level 1
+x 12
+y 1
 end
 arch dungeon_floor
 x 12
@@ -1689,9 +1690,9 @@ y 4
 end
 arch mover_7
 maxhp 1
+level 1
 x 12
 y 4
-level 1
 end
 arch dungeon_floor
 x 12
@@ -1706,18 +1707,18 @@ x 12
 y 6
 end
 arch skeleton
+stand_still 1
 x 12
 y 6
-stand_still 1
 end
 arch dungeon_floor
 x 12
 y 7
 end
 arch skeleton
+stand_still 1
 x 12
 y 7
-stand_still 1
 end
 arch dungeon_floor
 x 12
@@ -1732,18 +1733,18 @@ x 12
 y 9
 end
 arch zombie
+stand_still 1
 x 12
 y 9
-stand_still 1
 end
 arch dungeon_floor
 x 12
 y 10
 end
 arch zombie
+stand_still 1
 x 12
 y 10
-stand_still 1
 end
 arch dungeon_floor
 x 12
@@ -1775,9 +1776,9 @@ y 14
 end
 arch mover_2
 maxhp 1
+level 1
 x 12
 y 14
-level 1
 end
 arch dungeon_floor
 x 12
@@ -1799,10 +1800,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 13
-y 1
 speed -2.000000
 level 1
+x 13
+y 1
 end
 arch dungeon_floor
 x 13
@@ -1834,9 +1835,9 @@ y 5
 end
 arch mover_8
 maxhp 1
+level 1
 x 13
 y 5
-level 1
 end
 arch dirtfloor
 x 13
@@ -1844,9 +1845,9 @@ y 6
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 6
-level 1
 end
 arch dirtfloor
 x 13
@@ -1854,9 +1855,9 @@ y 7
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 7
-level 1
 end
 arch dirtfloor
 x 13
@@ -1864,9 +1865,9 @@ y 8
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 8
-level 1
 end
 arch dirtfloor
 x 13
@@ -1874,9 +1875,9 @@ y 9
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 9
-level 1
 end
 arch dirtfloor
 x 13
@@ -1884,9 +1885,9 @@ y 10
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 10
-level 1
 end
 arch dirtfloor
 x 13
@@ -1894,9 +1895,9 @@ y 11
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 11
-level 1
 end
 arch dirtfloor
 x 13
@@ -1904,9 +1905,9 @@ y 12
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 12
-level 1
 end
 arch dirtfloor
 x 13
@@ -1914,9 +1915,9 @@ y 13
 end
 arch mover_1
 maxhp 1
+level 1
 x 13
 y 13
-level 1
 end
 arch dungeon_floor
 x 13
@@ -1946,18 +1947,18 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 14
 y 1
-level 1
 end
 arch dungeon_floor
 x 14
 y 2
 end
 arch ghost
+stand_still 1
 x 14
 y 2
-stand_still 1
 end
 arch dungeon_floor
 x 14
@@ -1995,7 +1996,7 @@ arch dungeon_floor
 x 14
 y 7
 end
-arch wwall_win1
+arch woodwall_win1
 x 14
 y 7
 end
@@ -2076,18 +2077,18 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 15
 y 1
-level 1
 end
 arch dungeon_floor
 x 15
 y 2
 end
 arch ghost
+stand_still 1
 x 15
 y 2
-stand_still 1
 end
 arch dungeon_floor
 x 15
@@ -2110,28 +2111,28 @@ x 15
 y 5
 end
 arch wraith
+stand_still 1
 x 15
 y 5
-stand_still 1
 end
 arch dungeon_floor
 x 15
 y 6
 end
 arch wraith
-x 15
-y 6
 unaggressive 1
 stand_still 1
+x 15
+y 6
 end
 arch dungeon_floor
 x 15
 y 7
 end
 arch wraith
+stand_still 1
 x 15
 y 7
-stand_still 1
 end
 arch dungeon_floor
 x 15
@@ -2162,30 +2163,30 @@ x 15
 y 11
 end
 arch wraith
+unaggressive 1
+stand_still 1
 x 15
 y 11
-unaggressive 1
-stand_still 1
 end
 arch dungeon_floor
 x 15
 y 12
 end
 arch wraith
-x 15
-y 12
 unaggressive 1
 stand_still 1
+x 15
+y 12
 end
 arch dungeon_floor
 x 15
 y 13
 end
 arch wraith
-x 15
-y 13
 unaggressive 1
 stand_still 1
+x 15
+y 13
 end
 arch dungeon_floor
 x 15
@@ -2215,27 +2216,27 @@ y 1
 end
 arch mover_4
 maxhp 1
+level 1
 x 16
 y 1
-level 1
 end
 arch dungeon_floor
 x 16
 y 2
 end
 arch ghost
+stand_still 1
 x 16
 y 2
-stand_still 1
 end
 arch dungeon_floor
 x 16
 y 3
 end
 arch ghost
+stand_still 1
 x 16
 y 3
-stand_still 1
 end
 arch dungeon_floor
 x 16
@@ -2349,9 +2350,9 @@ y 2
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 2
-level 1
 end
 arch dirtfloor
 x 17
@@ -2359,9 +2360,9 @@ y 3
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 3
-level 1
 end
 arch dirtfloor
 x 17
@@ -2369,10 +2370,10 @@ y 4
 end
 arch mover_5
 maxhp 1
-x 17
-y 4
 speed -2.000000
 level 1
+x 17
+y 4
 end
 arch dirtfloor
 x 17
@@ -2380,9 +2381,9 @@ y 5
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 5
-level 1
 end
 arch dirtfloor
 x 17
@@ -2390,9 +2391,9 @@ y 6
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 6
-level 1
 end
 arch dirtfloor
 x 17
@@ -2400,9 +2401,9 @@ y 7
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 7
-level 1
 end
 arch dirtfloor
 x 17
@@ -2410,9 +2411,9 @@ y 8
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 8
-level 1
 end
 arch dirtfloor
 x 17
@@ -2420,9 +2421,9 @@ y 9
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 9
-level 1
 end
 arch dirtfloor
 x 17
@@ -2430,9 +2431,9 @@ y 10
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 10
-level 1
 end
 arch dirtfloor
 x 17
@@ -2440,9 +2441,9 @@ y 11
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 11
-level 1
 end
 arch dirtfloor
 x 17
@@ -2450,9 +2451,9 @@ y 12
 end
 arch mover_5
 maxhp 1
+level 1
 x 17
 y 12
-level 1
 end
 arch dirtfloor
 x 17
@@ -2460,9 +2461,9 @@ y 13
 end
 arch mover_4
 maxhp 1
+level 1
 x 17
 y 13
-level 1
 end
 arch dungeon_floor
 x 17
@@ -2522,7 +2523,7 @@ arch dungeon_floor
 x 18
 y 5
 end
-arch wwall_win1
+arch woodwall_win1
 x 18
 y 5
 end
@@ -2547,10 +2548,10 @@ x 18
 y 8
 end
 arch wight
-x 18
-y 8
 unaggressive 1
 stand_still 1
+x 18
+y 8
 end
 arch dungeon_floor
 x 18
@@ -2565,10 +2566,10 @@ x 18
 y 10
 end
 arch ghast
-x 18
-y 10
 unaggressive 1
 stand_still 1
+x 18
+y 10
 end
 arch dungeon_floor
 x 18
@@ -2600,9 +2601,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 18
 y 14
-level 1
 end
 arch dungeon_floor
 x 18
@@ -2632,9 +2633,9 @@ y 2
 end
 arch mover_2
 maxhp 1
+level 1
 x 19
 y 2
-level 1
 end
 arch dirtfloor
 x 19
@@ -2642,9 +2643,9 @@ y 3
 end
 arch mover_1
 maxhp 1
+level 1
 x 19
 y 3
-level 1
 end
 arch dirtfloor
 x 19
@@ -2652,9 +2653,9 @@ y 4
 end
 arch mover_1
 maxhp 1
+level 1
 x 19
 y 4
-level 1
 end
 arch dirtfloor
 x 19
@@ -2662,9 +2663,9 @@ y 5
 end
 arch mover_1
 maxhp 1
+level 1
 x 19
 y 5
-level 1
 end
 arch dirtfloor
 x 19
@@ -2672,9 +2673,9 @@ y 6
 end
 arch mover_1
 maxhp 1
+level 1
 x 19
 y 6
-level 1
 end
 arch dungeon_floor
 x 19
@@ -2729,10 +2730,10 @@ x 19
 y 13
 end
 arch nightmare
-x 19
-y 13
 unaggressive 1
 stand_still 1
+x 19
+y 13
 end
 arch dirtfloor
 x 19
@@ -2740,9 +2741,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 19
 y 14
-level 1
 end
 arch dungeon_floor
 x 19
@@ -2764,9 +2765,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 20
 y 1
-level 1
 end
 arch dungeon_floor
 x 20
@@ -2806,9 +2807,9 @@ y 6
 end
 arch mover_7
 maxhp 1
+level 1
 x 20
 y 6
-level 1
 end
 arch dungeon_floor
 x 20
@@ -2863,10 +2864,10 @@ x 20
 y 13
 end
 arch nightmare
-x 20
-y 13
 unaggressive 1
 stand_still 1
+x 20
+y 13
 end
 arch dirtfloor
 x 20
@@ -2874,9 +2875,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 20
 y 14
-level 1
 end
 arch dungeon_floor
 x 20
@@ -2898,9 +2899,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 21
 y 1
-level 1
 end
 arch dungeon_floor
 x 21
@@ -2916,9 +2917,9 @@ y 3
 end
 arch mover_5
 maxhp 1
+level 1
 x 21
 y 3
-level 1
 end
 arch dirtfloor
 x 21
@@ -2926,9 +2927,9 @@ y 4
 end
 arch mover_5
 maxhp 1
+level 1
 x 21
 y 4
-level 1
 end
 arch dirtfloor
 x 21
@@ -2936,9 +2937,9 @@ y 5
 end
 arch mover_5
 maxhp 1
+level 1
 x 21
 y 5
-level 1
 end
 arch dirtfloor
 x 21
@@ -2946,9 +2947,9 @@ y 6
 end
 arch mover_7
 maxhp 1
+level 1
 x 21
 y 6
-level 1
 end
 arch dirtfloor
 x 21
@@ -2956,9 +2957,9 @@ y 7
 end
 arch mover_1
 maxhp 1
+level 1
 x 21
 y 7
-level 1
 end
 arch dirtfloor
 x 21
@@ -2966,9 +2967,9 @@ y 8
 end
 arch mover_1
 maxhp 1
+level 1
 x 21
 y 8
-level 1
 end
 arch dirtfloor
 x 21
@@ -2976,9 +2977,9 @@ y 9
 end
 arch mover_1
 maxhp 1
+level 1
 x 21
 y 9
-level 1
 end
 arch dungeon_floor
 x 21
@@ -3018,9 +3019,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 21
 y 14
-level 1
 end
 arch dungeon_floor
 x 21
@@ -3042,10 +3043,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 22
-y 1
 speed -0.050000
 level 1
+x 22
+y 1
 end
 arch dungeon_floor
 x 22
@@ -3061,31 +3062,31 @@ y 3
 end
 arch mover_7
 maxhp 1
+level 1
 x 22
 y 3
-level 1
 end
 arch dungeon_floor
 x 22
 y 4
 end
 arch spectre
-x 22
-y 4
 invisible 0
 unaggressive 1
 stand_still 1
+x 22
+y 4
 end
 arch dungeon_floor
 x 22
 y 5
 end
 arch spectre
-x 22
-y 5
 invisible 0
 unaggressive 1
 stand_still 1
+x 22
+y 5
 end
 arch dungeon_floor
 x 22
@@ -3117,9 +3118,9 @@ y 9
 end
 arch mover_7
 maxhp 1
+level 1
 x 22
 y 9
-level 1
 end
 arch dungeon_floor
 x 22
@@ -3150,10 +3151,10 @@ x 22
 y 13
 end
 arch vampire
-x 22
-y 13
 unaggressive 1
 stand_still 1
+x 22
+y 13
 end
 arch dirtfloor
 x 22
@@ -3161,9 +3162,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 22
 y 14
-level 1
 end
 arch dungeon_floor
 x 22
@@ -3185,9 +3186,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 23
 y 1
-level 1
 end
 arch dungeon_floor
 x 23
@@ -3203,9 +3204,9 @@ y 3
 end
 arch mover_7
 maxhp 1
+level 1
 x 23
 y 3
-level 1
 end
 arch dirtfloor
 x 23
@@ -3213,9 +3214,9 @@ y 4
 end
 arch mover_1
 maxhp 1
+level 1
 x 23
 y 4
-level 1
 end
 arch dirtfloor
 x 23
@@ -3223,9 +3224,9 @@ y 5
 end
 arch mover_1
 maxhp 1
+level 1
 x 23
 y 5
-level 1
 end
 arch dungeon_floor
 x 23
@@ -3248,10 +3249,10 @@ x 23
 y 8
 end
 arch beholder
-x 23
-y 8
 unaggressive 1
 stand_still 1
+x 23
+y 8
 end
 arch dirtfloor
 x 23
@@ -3259,19 +3260,19 @@ y 9
 end
 arch mover_7
 maxhp 1
+level 1
 x 23
 y 9
-level 1
 end
 arch dungeon_floor
 x 23
 y 10
 end
 arch beholder
-x 23
-y 10
 unaggressive 1
 stand_still 1
+x 23
+y 10
 end
 arch dungeon_floor
 x 23
@@ -3294,10 +3295,10 @@ x 23
 y 13
 end
 arch vampire
-x 23
-y 13
 unaggressive 1
 stand_still 1
+x 23
+y 13
 end
 arch dirtfloor
 x 23
@@ -3305,9 +3306,9 @@ y 14
 end
 arch mover_3
 maxhp 1
+level 1
 x 23
 y 14
-level 1
 end
 arch dungeon_floor
 x 23
@@ -3329,9 +3330,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 24
 y 1
-level 1
 end
 arch dungeon_floor
 x 24
@@ -3345,7 +3346,7 @@ arch dungeon_floor
 x 24
 y 3
 end
-arch wwall_win1
+arch woodwall_win1
 x 24
 y 3
 end
@@ -3371,9 +3372,9 @@ y 6
 end
 arch mover_8
 maxhp 1
+level 1
 x 24
 y 6
-level 1
 end
 arch dungeon_floor
 x 24
@@ -3388,10 +3389,10 @@ x 24
 y 8
 end
 arch beholder
-x 24
-y 8
 unaggressive 1
 stand_still 1
+x 24
+y 8
 end
 arch dirtfloor
 x 24
@@ -3399,19 +3400,19 @@ y 9
 end
 arch mover_7
 maxhp 1
+level 1
 x 24
 y 9
-level 1
 end
 arch dungeon_floor
 x 24
 y 10
 end
 arch beholder
-x 24
-y 10
 unaggressive 1
 stand_still 1
+x 24
+y 10
 end
 arch dungeon_floor
 x 24
@@ -3443,9 +3444,9 @@ y 14
 end
 arch mover_2
 maxhp 1
+level 1
 x 24
 y 14
-level 1
 end
 arch dungeon_floor
 x 24
@@ -3467,10 +3468,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 25
-y 1
 speed -0.100000
 level 1
+x 25
+y 1
 end
 arch dungeon_floor
 x 25
@@ -3498,9 +3499,9 @@ y 6
 end
 arch mover_7
 maxhp 1
+level 1
 x 25
 y 6
-level 1
 end
 arch dirtfloor
 x 25
@@ -3508,9 +3509,9 @@ y 7
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 7
-level 1
 end
 arch dirtfloor
 x 25
@@ -3518,9 +3519,9 @@ y 8
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 8
-level 1
 end
 arch dirtfloor
 x 25
@@ -3528,9 +3529,9 @@ y 9
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 9
-level 1
 end
 arch dirtfloor
 x 25
@@ -3538,9 +3539,9 @@ y 10
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 10
-level 1
 end
 arch dirtfloor
 x 25
@@ -3548,9 +3549,9 @@ y 11
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 11
-level 1
 end
 arch dirtfloor
 x 25
@@ -3558,9 +3559,9 @@ y 12
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 12
-level 1
 end
 arch dirtfloor
 x 25
@@ -3568,9 +3569,9 @@ y 13
 end
 arch mover_1
 maxhp 1
+level 1
 x 25
 y 13
-level 1
 end
 arch dungeon_floor
 x 25
@@ -3600,10 +3601,10 @@ y 1
 end
 arch mover_3
 maxhp 1
-x 26
-y 1
 speed -0.100000
 level 1
+x 26
+y 1
 end
 arch dungeon_floor
 x 26
@@ -3717,9 +3718,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 27
 y 1
-level 1
 end
 arch dungeon_floor
 x 27
@@ -3758,10 +3759,10 @@ x 27
 y 6
 end
 arch skull
+unaggressive 1
+stand_still 1
 x 27
 y 6
-unaggressive 1
-stand_still 1
 end
 arch dirtfloor
 x 27
@@ -3769,20 +3770,20 @@ y 7
 end
 arch mover_4
 maxhp 1
-x 27
-y 7
 speed -1.000000
 level 1
+x 27
+y 7
 end
 arch dungeon_floor
 x 27
 y 8
 end
 arch skull
-x 27
-y 8
 unaggressive 1
 stand_still 1
+x 27
+y 8
 end
 arch dirtfloor
 x 27
@@ -3790,20 +3791,20 @@ y 9
 end
 arch mover_4
 maxhp 1
-x 27
-y 9
 speed -1.000000
 level 1
+x 27
+y 9
 end
 arch dungeon_floor
 x 27
 y 10
 end
 arch skull
-x 27
-y 10
 unaggressive 1
 stand_still 1
+x 27
+y 10
 end
 arch dungeon_floor
 x 27
@@ -3827,9 +3828,9 @@ y 13
 end
 arch mover_5
 maxhp 1
+level 1
 x 27
 y 13
-level 1
 end
 arch dirtfloor
 x 27
@@ -3837,9 +3838,9 @@ y 14
 end
 arch mover_5
 maxhp 1
+level 1
 x 27
 y 14
-level 1
 end
 arch dirtfloor
 x 27
@@ -3864,9 +3865,9 @@ y 1
 end
 arch mover_3
 maxhp 1
+level 1
 x 28
 y 1
-level 1
 end
 arch dungeon_floor
 x 28
@@ -3898,20 +3899,20 @@ y 6
 end
 arch mover_6
 maxhp 1
-x 28
-y 6
 speed -1.000000
 level 1
+x 28
+y 6
 end
 arch dungeon_floor
 x 28
 y 7
 end
 arch skull
-x 28
-y 7
 unaggressive 1
 stand_still 1
+x 28
+y 7
 end
 arch dirtfloor
 x 28
@@ -3919,20 +3920,20 @@ y 8
 end
 arch mover_6
 maxhp 1
-x 28
-y 8
 speed -1.000000
 level 1
+x 28
+y 8
 end
 arch dungeon_floor
 x 28
 y 9
 end
 arch skull
-x 28
-y 9
 unaggressive 1
 stand_still 1
+x 28
+y 9
 end
 arch dirtfloor
 x 28
@@ -3940,10 +3941,10 @@ y 10
 end
 arch mover_3
 maxhp 1
-x 28
-y 10
 speed -1.000000
 level 1
+x 28
+y 10
 end
 arch dungeon_floor
 x 28
@@ -3959,10 +3960,10 @@ y 12
 end
 arch mover_6
 maxhp 1
-x 28
-y 12
 speed -1.000000
 level 1
+x 28
+y 12
 end
 arch dungeon_floor
 x 28
@@ -3992,9 +3993,9 @@ y 1
 end
 arch mover_4
 maxhp 1
+level 1
 x 29
 y 1
-level 1
 end
 arch dungeon_floor
 x 29
@@ -4026,9 +4027,9 @@ y 6
 end
 arch mover_7
 maxhp 1
+level 1
 x 29
 y 6
-level 1
 end
 arch dungeon_floor
 x 29
@@ -4060,9 +4061,9 @@ y 10
 end
 arch mover_3
 maxhp 1
+level 1
 x 29
 y 10
-level 1
 end
 arch dungeon_floor
 x 29
@@ -4078,9 +4079,9 @@ y 12
 end
 arch mover_7
 maxhp 1
+level 1
 x 29
 y 12
-level 1
 end
 arch dungeon_floor
 x 29
@@ -4118,9 +4119,9 @@ y 2
 end
 arch mover_5
 maxhp 1
+level 1
 x 30
 y 2
-level 1
 end
 arch dirtfloor
 x 30
@@ -4128,10 +4129,10 @@ y 3
 end
 arch mover_5
 maxhp 1
+speed -0.100000
+level 1
 x 30
 y 3
-speed -0.100000
-level 1
 end
 arch dirtfloor
 x 30
@@ -4139,10 +4140,10 @@ y 4
 end
 arch mover_5
 maxhp 1
-x 30
-y 4
 speed -0.100000
 level 1
+x 30
+y 4
 end
 arch dirtfloor
 x 30
@@ -4150,9 +4151,9 @@ y 5
 end
 arch mover_5
 maxhp 1
+level 1
 x 30
 y 5
-level 1
 end
 arch dirtfloor
 x 30
@@ -4160,9 +4161,9 @@ y 6
 end
 arch mover_7
 maxhp 1
+level 1
 x 30
 y 6
-level 1
 end
 arch dungeon_floor
 x 30
@@ -4185,10 +4186,10 @@ x 30
 y 9
 end
 arch demilich
-x 30
-y 9
 stand_still 1
 random_movement 0
+x 30
+y 9
 end
 arch dirtfloor
 x 30
@@ -4196,9 +4197,9 @@ y 10
 end
 arch mover_5
 maxhp 1
+level 1
 x 30
 y 10
-level 1
 end
 arch dirtfloor
 x 30
@@ -4206,9 +4207,9 @@ y 11
 end
 arch mover_5
 maxhp 1
+level 1
 x 30
 y 11
-level 1
 end
 arch dirtfloor
 x 30
@@ -4216,9 +4217,9 @@ y 12
 end
 arch mover_7
 maxhp 1
+level 1
 x 30
 y 12
-level 1
 end
 arch dungeon_floor
 x 30
@@ -4363,129 +4364,20 @@ x 31
 y 15
 end
 arch golem_necro
+unaggressive 1
+stand_still 1
 x 25
 y 2
-unaggressive 1
-stand_still 1
-end
-More
-arch golem_necro_2
-hp 10000
-x 26
-y 2
-unaggressive 1
-stand_still 1
-end
-More
-arch golem_necro_3
-hp 10000
-x 25
-y 3
-unaggressive 1
-stand_still 1
-end
-More
-arch golem_necro_4
-hp 10000
-x 26
-y 3
-unaggressive 1
-stand_still 1
-end
-More
-arch golem_necro_5
-hp 10000
-x 25
-y 4
-unaggressive 1
-stand_still 1
-end
-More
-arch golem_necro_6
-hp 10000
-x 26
-y 4
-unaggressive 1
-stand_still 1
 end
 arch dread
+unaggressive 1
+stand_still 1
 x 28
 y 3
-unaggressive 1
-stand_still 1
-end
-More
-arch dread_2
-hp 1500
-x 29
-y 3
-unaggressive 1
-stand_still 1
-end
-More
-arch dread_3
-hp 1500
-x 28
-y 4
-unaggressive 1
-stand_still 1
-end
-More
-arch dread_4
-hp 1500
-x 29
-y 4
-unaggressive 1
-stand_still 1
 end
 arch big_dragon_worthless
+unaggressive 1
+stand_still 1
 x 28
 y 13
-unaggressive 1
-stand_still 1
-end
-More
-arch big_worthless_dragon_2
-name worthless dragon
-hp 3500
-x 29
-y 13
-unaggressive 1
-stand_still 1
-end
-More
-arch big_worthless_dragon_3
-name worthless dragon
-hp 3500
-x 30
-y 13
-unaggressive 1
-stand_still 1
-end
-More
-arch big_worthless_dragon_4
-name worthless dragon
-hp 3500
-x 28
-y 14
-unaggressive 1
-stand_still 1
-end
-More
-arch big_worthless_dragon_5
-name worthless dragon
-hp 3500
-x 29
-y 14
-unaggressive 1
-stand_still 1
-end
-More
-arch big_worthless_dragon_6
-name worthless dragon
-hp 3500
-x 30
-y 14
-unaggressive 1
-stand_still 1
 end
diff --git a/darcap/darcap/circus/illusions b/darcap/darcap/circus/illusions
index e23f6c647..c81b060f8 100644
--- a/darcap/darcap/circus/illusions
+++ b/darcap/darcap/circus/illusions
@@ -1,13 +1,14 @@
 arch map
+name <untitled>
 msg
 Creator: Cater & Wade
 Email: john_cater@yahoo.com
 Date: Thu Jan 28 17:49:34 1999
 endmsg
-hp 18
-sp 11
-x 49
-y 49
+width 49
+height 49
+enter_x 18
+enter_y 11
 end
 arch small_stones
 end
@@ -1031,7 +1032,7 @@ arch pstone_1
 x 4
 y 6
 end
-arch wwall_win1
+arch woodwall_win1
 x 4
 y 6
 end
@@ -1083,10 +1084,10 @@ x 4
 y 11
 end
 arch door_look_2
-x 4
-y 11
 no_pass 0
 blocksview 1
+x 4
+y 11
 end
 arch magic_banned
 x 4
@@ -1104,10 +1105,10 @@ x 4
 y 12
 end
 arch door_look_2
-x 4
-y 12
 no_pass 0
 blocksview 1
+x 4
+y 12
 end
 arch pstone_1
 x 4
@@ -1145,7 +1146,7 @@ arch pstone_1
 x 4
 y 17
 end
-arch wwall_win1
+arch woodwall_win1
 x 4
 y 17
 end
@@ -1233,7 +1234,7 @@ arch pstone_1
 x 4
 y 31
 end
-arch wwall_win1
+arch woodwall_win1
 x 4
 y 31
 end
@@ -1321,7 +1322,7 @@ arch pstone_1
 x 4
 y 42
 end
-arch wwall_win1
+arch woodwall_win1
 x 4
 y 42
 end
@@ -1886,7 +1887,7 @@ arch pstone_1
 x 7
 y 4
 end
-arch wwall_win2
+arch woodwall_win2
 x 7
 y 4
 end
@@ -1970,7 +1971,7 @@ arch pstone_1
 x 7
 y 19
 end
-arch wwall_win2
+arch woodwall_win2
 x 7
 y 19
 end
@@ -2018,11 +2019,7 @@ arch pstone_1
 x 7
 y 29
 end
-arch pstone_1
-x 7
-y 29
-end
-arch wwall_win2
+arch woodwall_win2
 x 7
 y 29
 end
@@ -2094,11 +2091,7 @@ arch pstone_1
 x 7
 y 44
 end
-arch pstone_1
-x 7
-y 44
-end
-arch wwall_win2
+arch woodwall_win2
 x 7
 y 44
 end
@@ -2428,9 +2421,9 @@ x 9
 y 6
 end
 arch grate_closed_2
+connected 1
 x 9
 y 6
-connected 1
 end
 arch magic_banned
 x 9
@@ -2448,9 +2441,9 @@ x 9
 y 7
 end
 arch grate_closed_2
+connected 1
 x 9
 y 7
-connected 1
 end
 arch magic_banned
 x 9
@@ -2504,9 +2497,9 @@ x 9
 y 11
 end
 arch grate_closed_2
+connected 2
 x 9
 y 11
-connected 2
 end
 arch magic_banned
 x 9
@@ -2524,9 +2517,9 @@ x 9
 y 12
 end
 arch grate_closed_2
+connected 2
 x 9
 y 12
-connected 2
 end
 arch magic_banned
 x 9
@@ -2580,9 +2573,9 @@ x 9
 y 16
 end
 arch grate_closed_2
+connected 3
 x 9
 y 16
-connected 3
 end
 arch magic_banned
 x 9
@@ -2600,9 +2593,9 @@ x 9
 y 17
 end
 arch grate_closed_2
+connected 3
 x 9
 y 17
-connected 3
 end
 arch magic_banned
 x 9
@@ -2697,9 +2690,9 @@ x 9
 y 31
 end
 arch grate_closed_2
+connected 1
 x 9
 y 31
-connected 1
 end
 arch magic_banned
 x 9
@@ -2710,9 +2703,9 @@ x 9
 y 32
 end
 arch grate_closed_2
+connected 1
 x 9
 y 32
-connected 1
 end
 arch magic_banned
 x 9
@@ -2759,9 +2752,9 @@ x 9
 y 36
 end
 arch grate_closed_2
+connected 2
 x 9
 y 36
-connected 2
 end
 arch magic_banned
 x 9
@@ -2772,9 +2765,9 @@ x 9
 y 37
 end
 arch grate_closed_2
+connected 2
 x 9
 y 37
-connected 2
 end
 arch magic_banned
 x 9
@@ -2821,9 +2814,9 @@ x 9
 y 41
 end
 arch grate_closed_2
+connected 3
 x 9
 y 41
-connected 3
 end
 arch magic_banned
 x 9
@@ -2834,9 +2827,9 @@ x 9
 y 42
 end
 arch grate_closed_2
+connected 3
 x 9
 y 42
-connected 3
 end
 arch magic_banned
 x 9
@@ -2942,9 +2935,9 @@ x 10
 y 8
 end
 arch button_handle
+connected 1
 x 10
 y 8
-connected 1
 end
 arch magic_banned
 x 10
@@ -2995,9 +2988,9 @@ x 10
 y 13
 end
 arch button_handle
-x 10
-y 13
 connected 2
+x 10
+y 13
 end
 arch magic_banned
 x 10
@@ -3048,9 +3041,9 @@ x 10
 y 18
 end
 arch button_handle
+connected 3
 x 10
 y 18
-connected 3
 end
 arch magic_banned
 x 10
@@ -3153,9 +3146,9 @@ x 10
 y 33
 end
 arch button_handle
+connected 1
 x 10
 y 33
-connected 1
 end
 arch magic_banned
 x 10
@@ -3206,9 +3199,9 @@ x 10
 y 38
 end
 arch button_handle
-x 10
-y 38
 connected 2
+x 10
+y 38
 end
 arch magic_banned
 x 10
@@ -3259,9 +3252,9 @@ x 10
 y 43
 end
 arch button_handle
+connected 3
 x 10
 y 43
-connected 3
 end
 arch magic_banned
 x 10
@@ -3665,7 +3658,7 @@ arch pstone_1
 x 12
 y 4
 end
-arch wwall_win2
+arch woodwall_win2
 x 12
 y 4
 end
@@ -3789,7 +3782,7 @@ arch pstone_1
 x 12
 y 19
 end
-arch wwall_win2
+arch woodwall_win2
 x 12
 y 19
 end
@@ -3845,7 +3838,7 @@ arch pstone_1
 x 12
 y 29
 end
-arch wwall_win2
+arch woodwall_win2
 x 12
 y 29
 end
@@ -3969,7 +3962,7 @@ arch pstone_1
 x 12
 y 44
 end
-arch wwall_win2
+arch woodwall_win2
 x 12
 y 44
 end
@@ -4801,9 +4794,9 @@ x 15
 y 10
 end
 arch grate_closed_2
+connected 96
 x 15
 y 10
-connected 96
 end
 arch magic_banned
 x 15
@@ -4814,9 +4807,9 @@ x 15
 y 11
 end
 arch grate_closed_2
+connected 96
 x 15
 y 11
-connected 96
 end
 arch magic_banned
 x 15
@@ -4827,9 +4820,9 @@ x 15
 y 12
 end
 arch grate_closed_2
+connected 96
 x 15
 y 12
-connected 96
 end
 arch magic_banned
 x 15
@@ -4840,9 +4833,9 @@ x 15
 y 13
 end
 arch grate_closed_2
+connected 96
 x 15
 y 13
-connected 96
 end
 arch magic_banned
 x 15
@@ -5222,9 +5215,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 10
-connected 96
 end
 arch magic_banned
 x 16
@@ -5237,9 +5230,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 11
-connected 96
 end
 arch magic_banned
 x 16
@@ -5252,9 +5245,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 12
-connected 96
 end
 arch magic_banned
 x 16
@@ -5267,9 +5260,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 13
-connected 96
 end
 arch magic_banned
 x 16
@@ -5438,9 +5431,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 35
-connected 96
 end
 arch magic_banned
 x 16
@@ -5453,9 +5446,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 36
-connected 96
 end
 arch magic_banned
 x 16
@@ -5468,9 +5461,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 37
-connected 96
 end
 arch magic_banned
 x 16
@@ -5483,9 +5476,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 16
 y 38
-connected 96
 end
 arch magic_banned
 x 16
@@ -6397,7 +6390,7 @@ arch pstone_1
 x 19
 y 6
 end
-arch wwall_win1
+arch woodwall_win1
 x 19
 y 6
 end
@@ -6465,10 +6458,10 @@ x 19
 y 11
 end
 arch door_look_2
-x 19
-y 11
 no_pass 0
 blocksview 1
+x 19
+y 11
 end
 arch magic_banned
 x 19
@@ -6486,10 +6479,10 @@ x 19
 y 12
 end
 arch door_look_2
-x 19
-y 12
 no_pass 0
 blocksview 1
+x 19
+y 12
 end
 arch magic_banned
 x 19
@@ -6547,7 +6540,7 @@ arch pstone_1
 x 19
 y 17
 end
-arch wwall_win1
+arch woodwall_win1
 x 19
 y 17
 end
@@ -6651,7 +6644,7 @@ arch pstone_1
 x 19
 y 31
 end
-arch wwall_win1
+arch woodwall_win1
 x 19
 y 31
 end
@@ -6723,10 +6716,10 @@ x 19
 y 36
 end
 arch door_look_2
-x 19
-y 36
 no_pass 0
 blocksview 1
+x 19
+y 36
 end
 arch magic_banned
 x 19
@@ -6748,10 +6741,10 @@ x 19
 y 37
 end
 arch door_look_2
-x 19
-y 37
 no_pass 0
 blocksview 1
+x 19
+y 37
 end
 arch magic_banned
 x 19
@@ -6809,7 +6802,7 @@ arch pstone_1
 x 19
 y 42
 end
-arch wwall_win1
+arch woodwall_win1
 x 19
 y 42
 end
@@ -9160,7 +9153,7 @@ arch pstone_1
 x 29
 y 6
 end
-arch wwall_win1
+arch woodwall_win1
 x 29
 y 6
 end
@@ -9248,7 +9241,7 @@ arch pstone_1
 x 29
 y 17
 end
-arch wwall_win1
+arch woodwall_win1
 x 29
 y 17
 end
@@ -9336,7 +9329,7 @@ arch pstone_1
 x 29
 y 31
 end
-arch wwall_win1
+arch woodwall_win1
 x 29
 y 31
 end
@@ -9424,7 +9417,7 @@ arch pstone_1
 x 29
 y 42
 end
-arch wwall_win1
+arch woodwall_win1
 x 29
 y 42
 end
@@ -9965,7 +9958,7 @@ arch pstone_1
 x 32
 y 4
 end
-arch wwall_win2
+arch woodwall_win2
 x 32
 y 4
 end
@@ -10041,7 +10034,7 @@ arch pstone_1
 x 32
 y 19
 end
-arch wwall_win2
+arch woodwall_win2
 x 32
 y 19
 end
@@ -10093,7 +10086,7 @@ arch pstone_1
 x 32
 y 29
 end
-arch wwall_win2
+arch woodwall_win2
 x 32
 y 29
 end
@@ -10169,7 +10162,7 @@ arch pstone_1
 x 32
 y 44
 end
-arch wwall_win2
+arch woodwall_win2
 x 32
 y 44
 end
@@ -10534,9 +10527,9 @@ x 34
 y 6
 end
 arch grate_closed_2
+connected 1
 x 34
 y 6
-connected 1
 end
 arch magic_banned
 x 34
@@ -10547,9 +10540,9 @@ x 34
 y 7
 end
 arch grate_closed_2
+connected 1
 x 34
 y 7
-connected 1
 end
 arch magic_banned
 x 34
@@ -10596,9 +10589,9 @@ x 34
 y 11
 end
 arch grate_closed_2
+connected 2
 x 34
 y 11
-connected 2
 end
 arch magic_banned
 x 34
@@ -10609,9 +10602,9 @@ x 34
 y 12
 end
 arch grate_closed_2
+connected 2
 x 34
 y 12
-connected 2
 end
 arch magic_banned
 x 34
@@ -10658,9 +10651,9 @@ x 34
 y 16
 end
 arch grate_closed_2
+connected 3
 x 34
 y 16
-connected 3
 end
 arch magic_banned
 x 34
@@ -10671,9 +10664,9 @@ x 34
 y 17
 end
 arch grate_closed_2
+connected 3
 x 34
 y 17
-connected 3
 end
 arch magic_banned
 x 34
@@ -10768,9 +10761,9 @@ x 34
 y 31
 end
 arch grate_closed_2
+connected 1
 x 34
 y 31
-connected 1
 end
 arch magic_banned
 x 34
@@ -10781,9 +10774,9 @@ x 34
 y 32
 end
 arch grate_closed_2
+connected 1
 x 34
 y 32
-connected 1
 end
 arch magic_banned
 x 34
@@ -10830,9 +10823,9 @@ x 34
 y 36
 end
 arch grate_closed_2
+connected 2
 x 34
 y 36
-connected 2
 end
 arch magic_banned
 x 34
@@ -10843,9 +10836,9 @@ x 34
 y 37
 end
 arch grate_closed_2
+connected 2
 x 34
 y 37
-connected 2
 end
 arch magic_banned
 x 34
@@ -10892,9 +10885,9 @@ x 34
 y 41
 end
 arch grate_closed_2
+connected 3
 x 34
 y 41
-connected 3
 end
 arch magic_banned
 x 34
@@ -10905,9 +10898,9 @@ x 34
 y 42
 end
 arch grate_closed_2
+connected 3
 x 34
 y 42
-connected 3
 end
 arch magic_banned
 x 34
@@ -11013,9 +11006,9 @@ x 35
 y 8
 end
 arch button_handle
+connected 1
 x 35
 y 8
-connected 1
 end
 arch magic_banned
 x 35
@@ -11066,9 +11059,9 @@ x 35
 y 13
 end
 arch button_handle
-x 35
-y 13
 connected 2
+x 35
+y 13
 end
 arch magic_banned
 x 35
@@ -11119,9 +11112,9 @@ x 35
 y 18
 end
 arch button_handle
+connected 3
 x 35
 y 18
-connected 3
 end
 arch magic_banned
 x 35
@@ -11224,9 +11217,9 @@ x 35
 y 33
 end
 arch button_handle
+connected 1
 x 35
 y 33
-connected 1
 end
 arch magic_banned
 x 35
@@ -11277,9 +11270,9 @@ x 35
 y 38
 end
 arch button_handle
-x 35
-y 38
 connected 2
+x 35
+y 38
 end
 arch magic_banned
 x 35
@@ -11330,9 +11323,9 @@ x 35
 y 43
 end
 arch button_handle
+connected 3
 x 35
 y 43
-connected 3
 end
 arch magic_banned
 x 35
@@ -11736,7 +11729,7 @@ arch pstone_1
 x 37
 y 4
 end
-arch wwall_win2
+arch woodwall_win2
 x 37
 y 4
 end
@@ -11860,7 +11853,7 @@ arch pstone_1
 x 37
 y 19
 end
-arch wwall_win2
+arch woodwall_win2
 x 37
 y 19
 end
@@ -11916,7 +11909,7 @@ arch pstone_1
 x 37
 y 29
 end
-arch wwall_win2
+arch woodwall_win2
 x 37
 y 29
 end
@@ -12040,7 +12033,7 @@ arch pstone_1
 x 37
 y 44
 end
-arch wwall_win2
+arch woodwall_win2
 x 37
 y 44
 end
@@ -13289,9 +13282,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 10
-connected 96
 end
 arch magic_banned
 x 41
@@ -13304,9 +13297,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 11
-connected 96
 end
 arch magic_banned
 x 41
@@ -13319,9 +13312,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 12
-connected 96
 end
 arch magic_banned
 x 41
@@ -13334,9 +13327,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 13
-connected 96
 end
 arch magic_banned
 x 41
@@ -13505,9 +13498,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 35
-connected 96
 end
 arch magic_banned
 x 41
@@ -13520,9 +13513,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 36
-connected 96
 end
 arch magic_banned
 x 41
@@ -13535,9 +13528,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 37
-connected 96
 end
 arch magic_banned
 x 41
@@ -13550,9 +13543,9 @@ end
 arch goldfloor
 name drop 20 goldcoins
 food 20
+connected 96
 x 41
 y 38
-connected 96
 end
 arch magic_banned
 x 41
@@ -14464,7 +14457,7 @@ arch pstone_1
 x 44
 y 6
 end
-arch wwall_win1
+arch woodwall_win1
 x 44
 y 6
 end
@@ -14536,10 +14529,10 @@ x 44
 y 11
 end
 arch door_look_2
-x 44
-y 11
 no_pass 0
 blocksview 1
+x 44
+y 11
 end
 arch magic_banned
 x 44
@@ -14561,10 +14554,10 @@ x 44
 y 12
 end
 arch door_look_2
-x 44
-y 12
 no_pass 0
 blocksview 1
+x 44
+y 12
 end
 arch magic_banned
 x 44
@@ -14622,7 +14615,7 @@ arch pstone_1
 x 44
 y 17
 end
-arch wwall_win1
+arch woodwall_win1
 x 44
 y 17
 end
@@ -14726,7 +14719,7 @@ arch pstone_1
 x 44
 y 31
 end
-arch wwall_win1
+arch woodwall_win1
 x 44
 y 31
 end
@@ -14798,10 +14791,10 @@ x 44
 y 36
 end
 arch door_look_2
-x 44
-y 36
 no_pass 0
 blocksview 1
+x 44
+y 36
 end
 arch magic_banned
 x 44
@@ -14823,10 +14816,10 @@ x 44
 y 37
 end
 arch door_look_2
-x 44
-y 37
 no_pass 0
 blocksview 1
+x 44
+y 37
 end
 arch magic_banned
 x 44
@@ -14884,7 +14877,7 @@ arch pstone_1
 x 44
 y 42
 end
-arch wwall_win1
+arch woodwall_win1
 x 44
 y 42
 end
@@ -15958,284 +15951,108 @@ end
 arch unicorn
 y 16
 end
-More
-arch unicorn_2
-y 16
-end
 arch unicorn
 y 41
 end
-More
-arch unicorn_2
-y 41
-end
 arch active_volcano
 x 4
 y 1
 end
-More
-arch active_volcano_2
-x 5
-y 1
-end
 arch active_volcano
 x 4
 y 26
 end
-More
-arch active_volcano_2
-x 5
-y 26
-end
 arch active_volcano
 x 12
 end
-More
-arch active_volcano_2
-x 13
-end
 arch active_volcano
 x 12
 y 25
 end
-More
-arch active_volcano_2
-x 13
-y 25
-end
 arch unicorn
 x 15
 y 22
 end
-More
-arch unicorn_2
-x 16
-y 22
-end
 arch unicorn
 x 15
 y 47
 end
-More
-arch unicorn_2
-x 16
-y 47
-end
 arch volcano_high
 x 21
 y 1
 end
-More
-arch volcano_high_2
-x 22
-y 1
-end
-More
-arch volcano_high_3
-x 21
-y 2
-end
-More
-arch volcano_high_4
-x 22
-y 2
-end
 arch active_volcano
 x 21
 y 6
 end
-More
-arch active_volcano_2
-x 22
-y 6
-end
 arch unicorn
 x 21
 y 21
 end
-More
-arch unicorn_2
-x 22
-y 21
-end
 arch volcano_high
 x 21
 y 26
 end
-More
-arch volcano_high_2
-x 22
-y 26
-end
-More
-arch volcano_high_3
-x 21
-y 27
-end
-More
-arch volcano_high_4
-x 22
-y 27
-end
 arch active_volcano
 x 21
 y 31
 end
-More
-arch active_volcano_2
-x 22
-y 31
-end
 arch unicorn
 x 21
 y 46
 end
-More
-arch unicorn_2
-x 22
-y 46
-end
 arch unicorn
 x 25
 y 16
 end
-More
-arch unicorn_2
-x 26
-y 16
-end
 arch unicorn
 x 25
 y 41
 end
-More
-arch unicorn_2
-x 26
-y 41
-end
 arch active_volcano
 x 29
 y 1
 end
-More
-arch active_volcano_2
-x 30
-y 1
-end
 arch active_volcano
 x 29
 y 26
 end
-More
-arch active_volcano_2
-x 30
-y 26
-end
 arch active_volcano
 x 37
 end
-More
-arch active_volcano_2
-x 38
-end
 arch active_volcano
 x 37
 y 25
 end
-More
-arch active_volcano_2
-x 38
-y 25
-end
 arch unicorn
 x 40
 y 22
 end
-More
-arch unicorn_2
-x 41
-y 22
-end
 arch unicorn
 x 40
 y 47
 end
-More
-arch unicorn_2
-x 41
-y 47
-end
 arch volcano_high
 x 46
 y 1
 end
-More
-arch volcano_high_2
-x 47
-y 1
-end
-More
-arch volcano_high_3
-x 46
-y 2
-end
-More
-arch volcano_high_4
-x 47
-y 2
-end
 arch active_volcano
 x 46
 y 6
 end
-More
-arch active_volcano_2
-x 47
-y 6
-end
 arch unicorn
 x 46
 y 21
 end
-More
-arch unicorn_2
-x 47
-y 21
-end
 arch volcano_high
 x 46
 y 26
 end
-More
-arch volcano_high_2
-x 47
-y 26
-end
-More
-arch volcano_high_3
-x 46
-y 27
-end
-More
-arch volcano_high_4
-x 47
-y 27
-end
 arch active_volcano
 x 46
 y 31
 end
-More
-arch active_volcano_2
-x 47
-y 31
-end
 arch unicorn
 x 46
 y 46
 end
-More
-arch unicorn_2
-x 47
-y 46
-end
diff --git a/darcap/darcap/circus/wurfbude b/darcap/darcap/circus/wurfbude
index e0145a53f..378648c9c 100644
--- a/darcap/darcap/circus/wurfbude
+++ b/darcap/darcap/circus/wurfbude
@@ -120,6 +120,9 @@ end
 arch dungeon_magic
 y 6
 end
+arch grass
+y 6
+end
 arch magic_mouth
 name linecrossing
 msg
@@ -129,6 +132,12 @@ connected 4
 y 6
 end
 arch dungeon_magic
+y 6
+end
+arch dungeon_magic
+y 7
+end
+arch grass
 y 7
 end
 arch magic_mouth
@@ -140,6 +149,9 @@ connected 32
 y 7
 end
 arch dungeon_magic
+y 7
+end
+arch blocked
 y 8
 end
 arch dungeon_magic
@@ -173,18 +185,6 @@ arch dungeon_magic
 y 18
 end
 arch dungeon_magic
-y 19
-end
-arch magic_mouth
-name dontsteal
-msg
-Nobody shall carry missiles of
-the throwing gallery in or out
-endmsg
-connected 2
-y 19
-end
-arch dungeon_magic
 y 20
 end
 arch dungeon_magic
@@ -276,6 +276,10 @@ arch dungeon_magic
 x 1
 y 6
 end
+arch grass
+x 1
+y 6
+end
 arch magic_mouth
 name zombie hit
 msg
@@ -287,6 +291,14 @@ y 6
 end
 arch dungeon_magic
 x 1
+y 6
+end
+arch dungeon_magic
+x 1
+y 7
+end
+arch grass
+x 1
 y 7
 end
 arch magic_mouth
@@ -300,87 +312,81 @@ y 7
 end
 arch dungeon_magic
 x 1
+y 7
+end
+arch blocked
+x 1
 y 8
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 9
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 10
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 11
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 12
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 13
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 14
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 15
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 16
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 17
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 18
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 19
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 20
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 21
 end
-arch magic_mouth
-msg
-Please visit us again.
-endmsg
-connected 11
-walk_on 0
-fly_on 0
-x 1
-y 21
-end
-arch dungeon_magic
+arch blocked
 x 1
 y 22
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 23
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 24
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 25
 end
-arch dungeon_magic
+arch blocked
 x 1
 y 26
 end
@@ -613,6 +619,20 @@ y 19
 end
 arch dungeon_magic
 x 2
+y 19
+end
+arch magic_mouth
+name dontsteal
+msg
+Nobody shall carry missiles of
+the throwing gallery in or out
+endmsg
+connected 2
+x 2
+y 19
+end
+arch dungeon_magic
+x 2
 y 20
 end
 arch grass
@@ -3308,8 +3328,8 @@ x 9
 y 22
 end
 arch sage
-name Assistent
-face man.111
+name Assistant
+face man.151
 msg
 @match yes|Yes|YES
 Then you only have to hit each different
@@ -3317,8 +3337,8 @@ target with just one try.
 @match *
 Would you like to win a teddy?
 endmsg
-level 1
 randomitems none
+level 1
 speed 0.0
 dam 20
 wc 0
@@ -4080,6 +4100,15 @@ arch grass
 x 11
 y 20
 end
+arch magic_mouth
+msg
+Pets have to stay outside.
+endmsg
+connected 3
+food 1
+x 11
+y 20
+end
 arch dungeon_magic
 x 11
 y 21
@@ -4104,6 +4133,15 @@ arch grass
 x 11
 y 23
 end
+arch magic_mouth
+msg
+Welcome to Rumzap's Throwing Gallery.
+endmsg
+connected 1
+food 1
+x 11
+y 23
+end
 arch dungeon_magic
 x 11
 y 24
@@ -4122,6 +4160,20 @@ y 25
 end
 arch dungeon_magic
 x 11
+y 25
+end
+arch magic_mouth
+msg
+Please visit us again.
+endmsg
+connected 11
+walk_on 0
+fly_on 0
+x 11
+y 25
+end
+arch dungeon_magic
+x 11
 y 26
 end
 arch pstone_1
@@ -4195,56 +4247,90 @@ arch grass
 x 12
 y 5
 end
-arch swall_2_2_2
+arch blocked
 x 12
 y 6
 end
-arch swall_2_1_1
+arch blocked
 x 12
 y 7
 end
-arch swall_2_2_1
+arch blocked
 x 12
 y 8
 end
-arch swall_2_2_2
+arch blocked
+x 12
+y 9
+end
+arch blocked
 x 12
 y 10
 end
-arch bulletwall_3
+arch blocked
 x 12
 y 11
 end
-arch swall_3_2
+arch blocked
 x 12
 y 12
 end
-arch swall_2_1_1
+arch blocked
 x 12
 y 13
 end
-arch swall_2_2_1
+arch blocked
 x 12
 y 14
 end
-arch magic_mouth
-msg
-Pets have to stay outside.
-endmsg
-connected 3
-food 1
+arch blocked
+x 12
+y 15
+end
+arch blocked
+x 12
+y 16
+end
+arch blocked
+x 12
+y 17
+end
+arch blocked
+x 12
+y 18
+end
+arch blocked
+x 12
+y 19
+end
+arch blocked
 x 12
 y 20
 end
-arch magic_mouth
-msg
-Welcome to Rumzap's Throwing Gallery.
-endmsg
-connected 1
-food 1
+arch blocked
+x 12
+y 21
+end
+arch blocked
+x 12
+y 22
+end
+arch blocked
 x 12
 y 23
 end
+arch blocked
+x 12
+y 24
+end
+arch blocked
+x 12
+y 25
+end
+arch blocked
+x 12
+y 26
+end
 arch dungeon_magic
 x 13
 end
@@ -4311,57 +4397,27 @@ arch grass
 x 13
 y 5
 end
-arch swall_2_1_2
+arch blocked
 x 13
 y 6
 end
-arch teleporter
-hp 4
-sp 11
-speed 0.000000
-connected 123
-x 13
-y 7
-end
-arch swall_2_1_2
-x 13
-y 8
-end
-arch swall_2_1_2
+arch swall_2_2_2
 x 13
 y 10
 end
-arch grate_closed_2
-speed 0.500000
-connected 221
+arch bulletwall_3
 x 13
 y 11
 end
-arch swall_2_1_2
+arch swall_3_2
 x 13
 y 12
 end
-arch mover_3
+arch swall_2_1_1
 x 13
 y 13
 end
-arch snake_golem
-name tokenmover
-hp 1
-maxhp 1
-exp 0
-dam 0
-wc 0
-speed 0.000000
-level 0
-attacktype 0
-resist_physical 100
-resist_poison 0
-stand_still 1
-x 13
-y 13
-end
-arch swall_2_1_2
+arch swall_2_2_1
 x 13
 y 14
 end
@@ -4525,56 +4581,32 @@ arch grass
 x 14
 y 5
 end
-arch swall_2_1_2
+arch blocked
 x 14
 y 6
 end
-arch teleporter
-hp 4
-sp 11
-speed 0.000000
-connected 123
+arch swall_2_2_2
 x 14
 y 7
 end
-arch chair
-name taped socks
-face pouch.111
-type 0
-nrof 3
-weight 1000
-value 0
-material 128
-identified 1
-attacktype 256
-dam 1
-slaying wurfbude
-is_thrown 1
-x 14
-y 7
-end
-arch swall_2_1_2
+arch swall_2_1_1
 x 14
 y 8
 end
+arch swall_2_2_1
+x 14
+y 9
+end
 arch swall_2_1_2
 x 14
 y 10
 end
-arch button_plate
-weight 200000
+arch grate_closed_2
+speed 0.500000
 connected 221
 x 14
 y 11
 end
-arch teleporter
-hp 7
-sp 15
-speed 0.000000
-connected 222
-x 14
-y 11
-end
 arch swall_2_1_2
 x 14
 y 12
@@ -4583,9 +4615,19 @@ arch mover_3
 x 14
 y 13
 end
-arch grate_closed_2
-speed 0.500000
-connected 221
+arch snake_golem
+name tokenmover
+hp 1
+maxhp 1
+exp 0
+dam 0
+wc 0
+speed 0.000000
+level 0
+attacktype 0
+resist_physical 100
+resist_poison 0
+stand_still 1
 x 14
 y 13
 end
@@ -4658,21 +4700,25 @@ arch grass
 x 15
 y 5
 end
-arch swall_2_1_2
+arch blocked
 x 15
 y 6
 end
+arch swall_2_1_2
+x 15
+y 7
+end
 arch teleporter
 hp 4
 sp 11
 speed 0.000000
 connected 123
 x 15
-y 7
+y 8
 end
 arch swall_2_1_2
 x 15
-y 8
+y 9
 end
 arch swall_2_1_2
 x 15
@@ -4685,7 +4731,7 @@ x 15
 y 11
 end
 arch teleporter
-hp 8
+hp 7
 sp 15
 speed 0.000000
 connected 222
@@ -4700,22 +4746,75 @@ arch mover_3
 x 15
 y 13
 end
+arch grate_closed_2
+speed 0.500000
+connected 221
+x 15
+y 13
+end
 arch swall_2_1_2
 x 15
 y 14
 end
-arch swall_2_1_2
+arch blocked
+x 16
+end
+arch blocked
+x 16
+y 1
+end
+arch blocked
+x 16
+y 2
+end
+arch blocked
+x 16
+y 3
+end
+arch blocked
+x 16
+y 4
+end
+arch blocked
+x 16
+y 5
+end
+arch blocked
 x 16
 y 6
 end
-arch bulletwall_7
+arch swall_2_1_2
 x 16
 y 7
 end
-arch swall_2_1_2
+arch teleporter
+hp 4
+sp 11
+speed 0.000000
+connected 123
 x 16
 y 8
 end
+arch chair
+name taped socks
+face pouch.111
+type 0
+nrof 3
+weight 1000
+value 0
+material 128
+identified 1
+attacktype 256
+dam 1
+slaying wurfbude
+is_thrown 1
+x 16
+y 8
+end
+arch swall_2_1_2
+x 16
+y 9
+end
 arch swall_2_1_2
 x 16
 y 10
@@ -4727,7 +4826,7 @@ x 16
 y 11
 end
 arch teleporter
-hp 9
+hp 8
 sp 15
 speed 0.000000
 connected 222
@@ -4742,13 +4841,6 @@ arch mover_3
 x 16
 y 13
 end
-arch grate_open_2
-speed 0.500000
-value 1
-connected 221
-x 16
-y 13
-end
 arch swall_2_1_2
 x 16
 y 14
@@ -4801,41 +4893,52 @@ value 0
 invisible 1
 end
 end
-arch swall_2_2_3
-x 17
-y 6
-end
-arch swall_2_1_1
+arch swall_2_1_2
 x 17
 y 7
 end
-arch swall_2_2_4
+arch teleporter
+hp 4
+sp 11
+speed 0.000000
+connected 123
 x 17
 y 8
 end
-arch swall_2_2_3
+arch swall_2_1_2
+x 17
+y 9
+end
+arch swall_2_1_2
 x 17
 y 10
 end
-arch swall_2_1_1
+arch button_plate
+weight 200000
+connected 221
 x 17
 y 11
 end
-arch swall_3_1
+arch teleporter
+hp 9
+sp 15
+speed 0.000000
+connected 222
+x 17
+y 11
+end
+arch swall_2_1_2
 x 17
 y 12
 end
-arch button_plate
-weight 1
-connected 222
+arch mover_3
 x 17
 y 13
 end
-arch teleporter
-hp 13
-sp 13
-speed 0.000000
-connected 222
+arch grate_open_2
+speed 0.500000
+value 1
+connected 221
 x 17
 y 13
 end
@@ -4902,15 +5005,45 @@ value 0
 invisible 1
 end
 end
+arch swall_2_1_2
+x 18
+y 7
+end
+arch bulletwall_7
+x 18
+y 8
+end
+arch swall_2_1_2
+x 18
+y 9
+end
 arch swall_2_2_3
 x 18
-y 12
+y 10
 end
 arch swall_2_1_1
 x 18
+y 11
+end
+arch swall_3_1
+x 18
+y 12
+end
+arch button_plate
+weight 1
+connected 222
+x 18
 y 13
 end
-arch swall_2_2_4
+arch teleporter
+hp 13
+sp 13
+speed 0.000000
+connected 222
+x 18
+y 13
+end
+arch swall_2_1_2
 x 18
 y 14
 end
@@ -4960,6 +5093,30 @@ value 0
 invisible 1
 end
 end
+arch swall_2_2_3
+x 19
+y 7
+end
+arch swall_2_1_1
+x 19
+y 8
+end
+arch swall_2_2_4
+x 19
+y 9
+end
+arch swall_2_2_3
+x 19
+y 12
+end
+arch swall_2_1_1
+x 19
+y 13
+end
+arch swall_2_2_4
+x 19
+y 14
+end
 arch swall_2_2_2
 x 21
 y 18