Clean up walls and floors in /unlinked/kandora, also possibly other cleanup in there that I forgot to mention. But it was sad to see these broken maps.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9239 282e977c-c81d-0410-88c4-b93c2d0d6712
2008-06-05 22:12:27 +00:00 · 2008-06-05 22:12:27 +00:00 · 5185f70e89
parent ca80392cdd
commit 5185f70e89
22 changed files with 1410 additions and 469 deletions
--- a/unlinked/kandora/cave/cave3
+++ b/unlinked/kandora/cave/cave3
@ -5,7 +5,7 @@ height 14
 enter_x 1
 msg
 Created:  1999-02-28 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch jungle_2
@ -1196,6 +1196,10 @@ y 6
 end
 arch jungle_2
 x 14
+y 7
+end
+arch jungle_2
+x 14
 y 8
 end
 arch jungle_2
@ -1204,6 +1208,10 @@ y 9
 end
 arch jungle_2
 x 14
+y 10
+end
+arch jungle_2
+x 14
 y 11
 end
 arch jungle_2
--- a/unlinked/kandora/cave/m_inn
+++ b/unlinked/kandora/cave/m_inn
@ -5,6 +5,7 @@ height 14
 enter_y 10
 msg
 Created:  1999-02-28 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch grass
@ -252,6 +253,10 @@ arch flagstone
 x 2
 y 12
 end
+arch flagstone
+x 2
+y 13
+end
 arch oakdoor
 slaying mithril
 hp 10
@ -380,10 +385,6 @@ arch woodfloor2
 x 4
 y 4
 end
-arch flagstone
-x 4
-y 5
-end
 arch magic_mouth
 msg
 A nice porch with a view over the
@ -392,6 +393,10 @@ endmsg
 x 4
 y 5
 end
+arch flagstone
+x 4
+y 5
+end
 arch door_look_1
 x 4
 y 5
--- a/unlinked/kandora/cave/m_temple
+++ b/unlinked/kandora/cave/m_temple
@ -5,7 +5,7 @@ height 11
 enter_y 10
 msg
 Created:  1999-02-28 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch dungeon_floor
@ -174,10 +174,6 @@ arch dungeon_floor
 x 2
 y 9
 end
-arch dungeon_floor
-x 2
-y 10
-end
 arch invis_exit
 slaying mithril
 hp 10
@ -186,6 +182,10 @@ x 2
 y 10
 end
 arch dungeon_floor
+x 2
+y 10
+end
+arch dungeon_floor
 x 3
 end
 arch flagstone_2_1_2
@ -247,10 +247,6 @@ arch dungeon_floor
 x 3
 y 8
 end
-arch dungeon_floor
-x 3
-y 9
-end
 arch magic_mouth
 msg
 The temple is stark and forbidding.
@ -263,7 +259,7 @@ y 9
 end
 arch dungeon_floor
 x 3
-y 10
+y 9
 end
 arch invis_exit
 slaying mithril
@ -273,6 +269,10 @@ x 3
 y 10
 end
 arch dungeon_floor
+x 3
+y 10
+end
+arch dungeon_floor
 x 4
 end
 arch flagstone_2_1_2
@ -516,14 +516,6 @@ arch permanent_lava
 x 6
 y 1
 end
-arch dungeon_floor
-x 6
-y 2
-end
-arch dungeon_magic
-x 6
-y 2
-end
 arch magic_mouth
 msg
 A large boulder sways above the lava,
@ -535,6 +527,14 @@ y 2
 end
 arch dungeon_floor
 x 6
+y 2
+end
+arch dungeon_magic
+x 6
+y 2
+end
+arch dungeon_floor
+x 6
 y 3
 end
 arch dungeon_floor
@ -577,10 +577,6 @@ arch dungeon_floor
 x 6
 y 9
 end
-arch dungeon_floor
-x 6
-y 10
-end
 arch invis_exit
 slaying mithril
 hp 10
@ -589,6 +585,10 @@ x 6
 y 10
 end
 arch dungeon_floor
+x 6
+y 10
+end
+arch dungeon_floor
 x 7
 end
 arch flagstone_2_1_2
@ -630,10 +630,6 @@ arch dungeon_floor
 x 7
 y 9
 end
-arch dungeon_floor
-x 7
-y 10
-end
 arch invis_exit
 slaying mithril
 hp 10
@ -642,6 +638,10 @@ x 7
 y 10
 end
 arch dungeon_floor
+x 7
+y 10
+end
+arch dungeon_floor
 x 8
 end
 arch flagstone_2_1_2
--- a/unlinked/kandora/cave/mithril
+++ b/unlinked/kandora/cave/mithril
@ -5,6 +5,7 @@ height 14
 enter_y 10
 msg
 Created:  1999-02-28 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch mountain2
@ -36,12 +37,6 @@ end
 arch grass
 y 8
 end
-arch grass
-y 9
-end
-arch dirtroad_2_1_2
-y 9
-end
 arch invis_exit
 slaying ../kandora
 hp 7
@ -49,6 +44,12 @@ sp 5
 y 9
 end
 arch grass
+y 9
+end
+arch dirtroad_2_1_2
+y 9
+end
+arch grass
 y 10
 end
 arch hills
--- a/unlinked/kandora/circus/mp_castle
+++ b/unlinked/kandora/circus/mp_castle
@ -4,6 +4,7 @@ width 16
 height 16
 msg
 Created:  1999-02-18 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch small_stones
@ -46,6 +47,9 @@ end
 arch flagstone_2_1_1
 y 6
 end
+arch small_stones
+y 7
+end
 arch pillars
 y 7
 end
@ -85,10 +89,16 @@ end
 arch flagstone_2_1_1
 y 13
 end
+arch small_stones
+y 14
+end
 arch flagstone_2_2_1
 y 14
 end
 arch small_stones
+y 15
+end
+arch small_stones
 x 1
 end
 arch deep_swamp
@ -106,6 +116,10 @@ arch deep_swamp
 x 1
 y 2
 end
+arch small_stones
+x 1
+y 3
+end
 arch flagstone_2_1_2
 x 1
 y 3
@ -175,6 +189,10 @@ x 1
 y 14
 end
 arch small_stones
+x 1
+y 15
+end
+arch small_stones
 x 2
 end
 arch deep_swamp
@ -192,6 +210,10 @@ arch deep_swamp
 x 2
 y 2
 end
+arch small_stones
+x 2
+y 3
+end
 arch flagstone_2_1_2
 x 2
 y 3
@ -260,6 +282,10 @@ x 2
 y 14
 end
 arch small_stones
+x 2
+y 15
+end
+arch small_stones
 x 3
 end
 arch deep_swamp
@ -277,6 +303,10 @@ arch deep_swamp
 x 3
 y 2
 end
+arch small_stones
+x 3
+y 3
+end
 arch flagstone_2_1_2
 x 3
 y 3
@ -365,6 +395,10 @@ x 3
 y 14
 end
 arch small_stones
+x 3
+y 15
+end
+arch small_stones
 x 4
 end
 arch cobblestones2
@ -382,6 +416,10 @@ arch deep_swamp
 x 4
 y 2
 end
+arch small_stones
+x 4
+y 3
+end
 arch flagstone_2_1_2
 x 4
 y 3
@ -475,6 +513,10 @@ x 4
 y 14
 end
 arch small_stones
+x 4
+y 15
+end
+arch small_stones
 x 5
 end
 arch cobblestones2
@ -492,6 +534,10 @@ arch deep_swamp
 x 5
 y 2
 end
+arch small_stones
+x 5
+y 3
+end
 arch flagstone_2_1_2
 x 5
 y 3
@ -569,6 +615,10 @@ x 5
 y 14
 end
 arch small_stones
+x 5
+y 15
+end
+arch small_stones
 x 6
 end
 arch cobblestones2
@ -586,6 +636,10 @@ arch deep_swamp
 x 6
 y 2
 end
+arch small_stones
+x 6
+y 3
+end
 arch flagstone_3_4
 x 6
 y 3
@ -659,6 +713,10 @@ x 6
 y 14
 end
 arch small_stones
+x 6
+y 15
+end
+arch small_stones
 x 7
 end
 arch cobblestones2
@ -762,6 +820,10 @@ x 7
 y 14
 end
 arch small_stones
+x 7
+y 15
+end
+arch small_stones
 x 8
 end
 arch cobblestones2
@ -869,6 +931,10 @@ x 8
 y 14
 end
 arch small_stones
+x 8
+y 15
+end
+arch small_stones
 x 9
 end
 arch cobblestones2
@ -886,6 +952,10 @@ arch deep_swamp
 x 9
 y 2
 end
+arch small_stones
+x 9
+y 3
+end
 arch flagstone_3_2
 x 9
 y 3
@ -978,6 +1048,10 @@ x 9
 y 14
 end
 arch small_stones
+x 9
+y 15
+end
+arch small_stones
 x 10
 end
 arch cobblestones2
@ -995,6 +1069,10 @@ arch deep_swamp
 x 10
 y 2
 end
+arch small_stones
+x 10
+y 3
+end
 arch flagstone_2_1_2
 x 10
 y 3
@ -1068,6 +1146,10 @@ x 10
 y 14
 end
 arch small_stones
+x 10
+y 15
+end
+arch small_stones
 x 11
 end
 arch cobblestones2
@ -1085,6 +1167,10 @@ arch deep_swamp
 x 11
 y 2
 end
+arch small_stones
+x 11
+y 3
+end
 arch flagstone_2_1_2
 x 11
 y 3
@ -1154,6 +1240,10 @@ x 11
 y 14
 end
 arch small_stones
+x 11
+y 15
+end
+arch small_stones
 x 12
 end
 arch deep_swamp
@ -1171,6 +1261,10 @@ arch deep_swamp
 x 12
 y 2
 end
+arch small_stones
+x 12
+y 3
+end
 arch flagstone_2_1_2
 x 12
 y 3
@ -1254,6 +1348,10 @@ x 12
 y 14
 end
 arch small_stones
+x 12
+y 15
+end
+arch small_stones
 x 13
 end
 arch deep_swamp
@ -1271,6 +1369,10 @@ arch deep_swamp
 x 13
 y 2
 end
+arch small_stones
+x 13
+y 3
+end
 arch flagstone_2_1_2
 x 13
 y 3
@ -1482,6 +1584,25 @@ arch small_stones
 x 14
 y 15
 end
+arch deep_swamp
+x 15
+end
+arch deep_swamp
+x 15
+y 1
+end
+arch deep_swamp
+x 15
+y 2
+end
+arch small_stones
+x 15
+y 3
+end
+arch small_stones
+x 15
+y 4
+end
 arch small_stones
 x 15
 y 5
@ -1506,7 +1627,23 @@ arch small_stones
 x 15
 y 10
 end
-arch flagstone_2_1_1
+arch small_stones
+x 15
+y 11
+end
+arch small_stones
 x 15
 y 12
 end
+arch small_stones
+x 15
+y 13
+end
+arch small_stones
+x 15
+y 14
+end
+arch small_stones
+x 15
+y 15
+end
--- a/unlinked/kandora/circus/mp_cave
+++ b/unlinked/kandora/circus/mp_cave
--- a/unlinked/kandora/circus/mp_church
+++ b/unlinked/kandora/circus/mp_church
@ -5,7 +5,7 @@ height 16
 enter_x 8
 msg
 Created:  1999-02-18 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch dungeon_floor
@ -808,10 +808,6 @@ hp 26
 sp 21
 x 8
 end
-arch dungeon_floor
-x 8
-y 1
-end
 arch magic_mouth
 msg
 smells of incense & sounds of chanting
@ -822,6 +818,10 @@ y 1
 end
 arch dungeon_floor
 x 8
+y 1
+end
+arch dungeon_floor
+x 8
 y 2
 end
 arch cwall_2_1_2
--- a/unlinked/kandora/circus/mp_start
+++ b/unlinked/kandora/circus/mp_start
@ -4,7 +4,7 @@ width 15
 height 13
 msg
 Created:  1999-02-15 King Zoobus
-Modified: 2008-05-30 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch goldfloor
@ -48,6 +48,9 @@ end
 arch goldfloor
 y 11
 end
+arch woodfloor
+y 12
+end
 arch earthwall
 y 12
 end
@ -110,6 +113,10 @@ arch goldfloor
 x 1
 y 11
 end
+arch woodfloor
+x 1
+y 12
+end
 arch earthwall
 x 1
 y 12
@ -161,6 +168,10 @@ arch goldfloor
 x 2
 y 11
 end
+arch woodfloor
+x 2
+y 12
+end
 arch earthwall
 x 2
 y 12
@ -222,6 +233,10 @@ arch wall_2_1_1
 x 3
 y 4
 end
+arch woodfloor
+x 3
+y 5
+end
 arch wall_2_2_1
 x 3
 y 5
@ -262,6 +277,10 @@ arch goldfloor
 x 3
 y 11
 end
+arch woodfloor
+x 3
+y 12
+end
 arch earthwall
 x 3
 y 12
@ -363,6 +382,10 @@ arch goldfloor
 x 4
 y 11
 end
+arch woodfloor
+x 4
+y 12
+end
 arch earthwall
 x 4
 y 12
@ -468,6 +491,10 @@ arch goldfloor
 x 5
 y 11
 end
+arch woodfloor
+x 5
+y 12
+end
 arch earthwall
 x 5
 y 12
@ -565,6 +592,10 @@ arch goldfloor
 x 6
 y 11
 end
+arch woodfloor
+x 6
+y 12
+end
 arch earthwall
 x 6
 y 12
@ -672,6 +703,10 @@ x 7
 y 6
 connected 4
 end
+arch woodfloor
+x 7
+y 7
+end
 arch monument
 name happy monument
 msg
@ -696,6 +731,10 @@ arch goldfloor
 x 7
 y 11
 end
+arch woodfloor
+x 7
+y 12
+end
 arch earthwall
 x 7
 y 12
@ -793,6 +832,10 @@ arch goldfloor
 x 8
 y 11
 end
+arch woodfloor
+x 8
+y 12
+end
 arch earthwall
 x 8
 y 12
@ -906,6 +949,10 @@ arch goldfloor
 x 9
 y 11
 end
+arch woodfloor
+x 9
+y 12
+end
 arch earthwall
 x 9
 y 12
@ -1003,6 +1050,10 @@ arch goldfloor
 x 10
 y 11
 end
+arch woodfloor
+x 10
+y 12
+end
 arch earthwall
 x 10
 y 12
@ -1064,6 +1115,10 @@ arch wall_2_1_1
 x 11
 y 4
 end
+arch woodfloor
+x 11
+y 5
+end
 arch wall_2_2_4
 x 11
 y 5
@ -1096,6 +1151,10 @@ arch goldfloor
 x 11
 y 11
 end
+arch woodfloor
+x 11
+y 12
+end
 arch earthwall
 x 11
 y 12
@ -1161,6 +1220,10 @@ arch generate_postman
 x 12
 y 11
 end
+arch woodfloor
+x 12
+y 12
+end
 arch earthwall
 x 12
 y 12
@ -1219,58 +1282,113 @@ arch goldfloor
 x 13
 y 11
 end
-arch earthwall
+arch woodfloor
 x 13
 y 12
 end
 arch earthwall
+x 13
+y 12
+end
+arch woodfloor
 x 14
 end
 arch earthwall
 x 14
+end
+arch woodfloor
+x 14
 y 1
 end
 arch earthwall
 x 14
+y 1
+end
+arch woodfloor
+x 14
 y 2
 end
 arch earthwall
 x 14
+y 2
+end
+arch woodfloor
+x 14
 y 3
 end
 arch earthwall
 x 14
+y 3
+end
+arch woodfloor
+x 14
 y 4
 end
 arch earthwall
 x 14
+y 4
+end
+arch woodfloor
+x 14
 y 5
 end
 arch earthwall
 x 14
+y 5
+end
+arch woodfloor
+x 14
 y 6
 end
 arch earthwall
 x 14
+y 6
+end
+arch woodfloor
+x 14
 y 7
 end
 arch earthwall
 x 14
+y 7
+end
+arch woodfloor
+x 14
 y 8
 end
 arch earthwall
 x 14
+y 8
+end
+arch woodfloor
+x 14
 y 9
 end
 arch earthwall
 x 14
+y 9
+end
+arch woodfloor
+x 14
 y 10
 end
 arch earthwall
 x 14
+y 10
+end
+arch woodfloor
+x 14
 y 11
 end
 arch earthwall
 x 14
+y 11
+end
+arch woodfloor
+x 14
+y 12
+end
+arch earthwall
+x 14
 y 12
 end
--- a/unlinked/kandora/circus/mp_tavern
+++ b/unlinked/kandora/circus/mp_tavern
@ -1,11 +1,11 @@
 arch map
 name c
-width 16
+width 15
 height 16
 enter_x 7
 msg
 Created:  1999-02-15 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch afloor_right
@ -27,10 +27,7 @@ end
 arch afloor_right
 y 3
 end
-arch wall_2_1_1
-y 3
-end
-arch wwall_win1
+arch window_win1
 y 3
 end
 arch afloor_right
@ -66,10 +63,7 @@ end
 arch afloor_right
 y 9
 end
-arch wall_2_1_1
-y 9
-end
-arch wwall_win1
+arch window_win1
 y 9
 end
 arch afloor_right
@ -347,10 +341,10 @@ end
 arch afloor_right
 x 3
 end
-arch fireplace
+arch wall_2_1_2
 x 3
 end
-arch wall_2_1_2
+arch fireplace
 x 3
 end
 arch afloor_right
@ -547,11 +541,7 @@ arch afloor_right
 x 4
 y 12
 end
-arch wall_2_1_2
-x 4
-y 12
-end
-arch wwall_win2
+arch window_win2
 x 4
 y 12
 end
@ -791,6 +781,9 @@ arch blackmarble
 x 6
 y 15
 end
+arch afloor_right
+x 7
+end
 arch oakdoor
 slaying petshop
 hp 1
@ -1081,7 +1074,7 @@ arch afloor_right
 x 9
 y 10
 end
-arch wwall_weak_1
+arch wall_2_1_1
 x 9
 y 10
 end
@ -1089,7 +1082,7 @@ arch afloor_right
 x 9
 y 11
 end
-arch wwall_weak_1
+arch wall_2_1_1
 x 9
 y 11
 end
@ -1097,7 +1090,7 @@ arch afloor_right
 x 9
 y 12
 end
-arch wwall_3_1
+arch wall_3_1
 x 9
 y 12
 end
@ -1117,14 +1110,6 @@ arch flagstone_2_1_1
 x 9
 y 14
 end
-arch afloor_right
-x 9
-y 15
-end
-arch trap_spikes2
-x 9
-y 15
-end
 arch magic_ear
 msg
@match yellow submarine
@ -1134,6 +1119,14 @@ x 9
 y 15
 connected 11
 end
+arch afloor_right
+x 9
+y 15
+end
+arch trap_spikes2
+x 9
+y 15
+end
 arch gateTrg2
 x 9
 y 15
@ -1205,7 +1198,7 @@ arch afloor_right
 x 10
 y 9
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 10
 y 9
 end
@ -1248,10 +1241,10 @@ end
 arch afloor_right
 x 11
 end
-arch fireplace
+arch wall_2_1_2
 x 11
 end
-arch wall_2_1_2
+arch fireplace
 x 11
 end
 arch afloor_right
@ -1330,7 +1323,7 @@ arch afloor_left
 x 11
 y 9
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 11
 y 9
 end
@ -1367,11 +1360,7 @@ arch afloor_right
 x 11
 y 12
 end
-arch wall_2_1_2
-x 11
-y 12
-end
-arch wwall_win2
+arch window_win2
 x 11
 y 12
 end
@ -1457,6 +1446,10 @@ arch afloor_right
 x 12
 y 9
 end
+arch wall_door_1_4
+x 12
+y 9
+end
 arch door_look_1
 x 12
 y 9
@ -1575,7 +1568,7 @@ arch afloor_right
 x 13
 y 9
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 13
 y 9
 end
@ -1698,7 +1691,7 @@ arch afloor_right
 x 14
 y 9
 end
-arch wall_2_1_1
+arch wall_3_4
 x 14
 y 9
 end
@ -1738,27 +1731,3 @@ arch afloor_right
 x 14
 y 15
 end
-arch wall_2_1_1
-x 15
-y 2
-end
-arch wall_2_1_1
-x 15
-y 3
-end
-arch wall_2_1_1
-x 15
-y 4
-end
-arch wall_2_1_1
-x 15
-y 5
-end
-arch wall_2_1_1
-x 15
-y 6
-end
-arch wall_2_1_1
-x 15
-y 7
-end
--- a/unlinked/kandora/circus/mp_world
+++ b/unlinked/kandora/circus/mp_world
@ -6,7 +6,7 @@ enter_x 39
 enter_y 39
 msg
 Created:  1999-02-18 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch desert
@ -339,10 +339,6 @@ arch sea
 x 1
 y 34
 end
-arch sea
-x 1
-y 35
-end
 arch pstone_1
 x 1
 y 35
@ -351,10 +347,6 @@ arch palm
 x 1
 y 35
 end
-arch sea
-x 1
-y 36
-end
 arch pstone_1
 x 1
 y 36
@ -551,36 +543,20 @@ arch sea
 x 2
 y 33
 end
-arch sea
-x 2
-y 34
-end
 arch pstone_1
 x 2
 y 34
 end
-arch sea
+arch pstone_1
 x 2
 y 35
 end
 arch pstone_1
 x 2
-y 35
-end
-arch sea
-x 2
 y 36
 end
 arch pstone_1
 x 2
-y 36
-end
-arch sea
-x 2
-y 37
-end
-arch pstone_1
-x 2
 y 37
 end
 arch phole_1
@ -788,10 +764,6 @@ arch sea
 x 3
 y 33
 end
-arch sea
-x 3
-y 34
-end
 arch pstone_1
 x 3
 y 34
@ -800,10 +772,6 @@ arch sea
 x 3
 y 35
 end
-arch sea
-x 3
-y 36
-end
 arch pstone_1
 x 3
 y 36
@ -812,10 +780,6 @@ arch palm
 x 3
 y 36
 end
-arch sea
-x 3
-y 37
-end
 arch pstone_1
 x 3
 y 37
@ -1026,10 +990,6 @@ arch sea
 x 4
 y 33
 end
-arch sea
-x 4
-y 34
-end
 arch pstone_1
 x 4
 y 34
@ -1047,18 +1007,10 @@ arch sea
 x 4
 y 35
 end
-arch sea
-x 4
-y 36
-end
 arch pstone_1
 x 4
 y 36
 end
-arch sea
-x 4
-y 37
-end
 arch pstone_1
 x 4
 y 37
@ -1252,28 +1204,16 @@ arch sea
 x 5
 y 33
 end
-arch sea
+arch pstone_1
 x 5
 y 34
 end
 arch pstone_1
 x 5
-y 34
-end
-arch sea
-x 5
 y 35
 end
 arch pstone_1
 x 5
-y 35
-end
-arch sea
-x 5
-y 36
-end
-arch pstone_1
-x 5
 y 36
 end
 arch sea
@ -2219,10 +2159,6 @@ x 10
 y 18
 speed_left -13.600000
 end
-arch swamp
-x 10
-y 19
-end
 arch magic_mouth
 msg
 ...and you must give us all a spanking
@ -2232,6 +2168,10 @@ y 19
 end
 arch swamp
 x 10
+y 19
+end
+arch swamp
+x 10
 y 20
 end
 arch fountain
@ -3450,9 +3390,6 @@ arch sea
 x 16
 y 39
 end
-arch sea
-x 17
-end
 arch small_stones
 x 17
 end
@ -3694,6 +3631,7 @@ y 39
 end
 arch sea
 x 18
+move_block all -boat -walk
 end
 arch drawbridge_1
 x 18
@ -3860,6 +3798,7 @@ y 39
 end
 arch sea
 x 19
+move_block all -boat -walk
 end
 arch drawbridge_1
 x 19
@ -4016,7 +3955,7 @@ arch sea
 x 19
 y 38
 end
-arch pier_1_3
+arch pier_1_4
 x 19
 y 38
 end
@ -4026,6 +3965,7 @@ y 39
 end
 arch sea
 x 20
+move_block all -boat -walk
 end
 arch drawbridge_1
 x 20
@ -4384,6 +4324,7 @@ y 1
 end
 arch knight
 msg
+@match *
 we are no longer the Knights who say
 Nie!, we are now the Knights who say,
 "icky icky wicky betwoo betong whoop
@ -5119,10 +5060,6 @@ arch fernsdense
 x 25
 y 9
 end
-arch brush
-x 25
-y 10
-end
 arch magic_mouth
 msg
 Hey you english sniggit!  I fling my
@ -5135,6 +5072,10 @@ y 10
 end
 arch brush
 x 25
+y 10
+end
+arch brush
+x 25
 y 11
 end
 arch dragon_steak
@ -5252,26 +5193,10 @@ arch grass
 x 25
 y 30
 end
-arch woods
-x 25
-y 30
-end
-arch grass
-x 25
-y 30
-end
-arch grass
-x 25
-y 31
-end
 arch farmland
 x 25
 y 31
 end
-arch grass
-x 25
-y 32
-end
 arch farmland
 x 25
 y 32
@ -5489,31 +5414,10 @@ arch woods
 x 26
 y 29
 end
-arch paved_2_1_1
-x 26
-y 30
-end
 arch grass
 x 26
 y 30
 end
-arch woods
-x 26
-y 30
-end
-arch sea
-x 26
-y 30
-speed_left -3.700000
-end
-arch grass
-x 26
-y 30
-end
-arch grass
-x 26
-y 31
-end
 arch farmland
 x 26
 y 31
@ -5539,7 +5443,7 @@ arch grass
 x 26
 y 34
 end
-arch yellow_1_3
+arch yellow_2_1_2
 x 26
 y 34
 end
@ -5743,15 +5647,6 @@ arch grass
 x 27
 y 31
 end
-arch sea
-x 27
-y 31
-speed_left -1.900000
-end
-arch grass
-x 27
-y 31
-end
 arch grass
 x 27
 y 32
@ -5768,7 +5663,7 @@ arch grass
 x 27
 y 34
 end
-arch yellow_1_3
+arch yellow_2_1_2
 x 27
 y 34
 end
@ -5952,15 +5847,6 @@ arch grass
 x 28
 y 31
 end
-arch sea
-x 28
-y 31
-speed_left -1.900000
-end
-arch grass
-x 28
-y 31
-end
 arch grass
 x 28
 y 32
@ -5973,7 +5859,7 @@ arch grass
 x 28
 y 34
 end
-arch yellow_1_3
+arch yellow_2_1_2
 x 28
 y 34
 end
@ -6153,20 +6039,11 @@ arch grass
 x 29
 y 33
 end
-arch sea
-x 29
-y 33
-speed_left -1.900000
-end
-arch grass
-x 29
-y 33
-end
 arch grass
 x 29
 y 34
 end
-arch yellow_1_3
+arch yellow_2_1_2
 x 29
 y 34
 end
@ -6346,24 +6223,11 @@ arch grass
 x 30
 y 33
 end
-arch paved_2_1_1
-x 30
-y 34
-end
 arch grass
 x 30
 y 34
 end
-arch sea
-x 30
-y 34
-speed_left -1.900000
-end
-arch grass
-x 30
-y 34
-end
-arch yellow_1_3
+arch yellow_2_1_2
 x 30
 y 34
 end
@ -6521,11 +6385,7 @@ arch woods
 x 31
 y 29
 end
-arch yellow_1_1
-x 31
-y 29
-end
-arch yellow_1_3
+arch yellow_2_2_2
 x 31
 y 29
 end
@ -6533,7 +6393,7 @@ arch grass
 x 31
 y 30
 end
-arch yellow_1_1
+arch yellow_2_1_1
 x 31
 y 30
 end
@ -6541,15 +6401,7 @@ arch grass
 x 31
 y 31
 end
-arch paved_2_1_1
-x 31
-y 31
-end
-arch grass
-x 31
-y 31
-end
-arch yellow_1_1
+arch yellow_2_1_1
 x 31
 y 31
 end
@ -6557,15 +6409,7 @@ arch grass
 x 31
 y 32
 end
-arch paved_2_1_1
-x 31
-y 32
-end
-arch grass
-x 31
-y 32
-end
-arch yellow_1_1
+arch yellow_2_1_1
 x 31
 y 32
 end
@ -6573,15 +6417,7 @@ arch grass
 x 31
 y 33
 end
-arch paved_2_1_1
-x 31
-y 33
-end
-arch grass
-x 31
-y 33
-end
-arch yellow_1_1
+arch yellow_2_1_1
 x 31
 y 33
 end
@ -6589,24 +6425,7 @@ arch grass
 x 31
 y 34
 end
-arch paved_2_1_1
-x 31
-y 34
-end
-arch sea
-x 31
-y 34
-speed_left -1.900000
-end
-arch grass
-x 31
-y 34
-end
-arch yellow_1_1
-x 31
-y 34
-end
-arch yellow_1_3
+arch yellow_2_2_4
 x 31
 y 34
 end
@ -6820,10 +6639,12 @@ end
 arch sea
 x 32
 y 26
+move_block all -boat -walk
 end
 arch bridge_ns
 x 32
 y 26
+move_on walk
 end
 arch rune_drain_magic
 x 32
@ -6833,7 +6654,7 @@ arch jungle_2
 x 32
 y 27
 end
-arch yellow_1_1
+arch yellow_2_1_1
 x 32
 y 27
 end
@ -6867,7 +6688,11 @@ end
 arch high_boots
 end
 end
-arch yellow_1_1
+arch jungle_2
+x 32
+y 28
+end
+arch yellow_2_1_1
 x 32
 y 28
 end
@ -6875,11 +6700,7 @@ arch woods
 x 32
 y 29
 end
-arch yellow_1_1
-x 32
-y 29
-end
-arch yellow_1_3
+arch yellow_2_2_4
 x 32
 y 29
 end
--- a/unlinked/kandora/dd_alchemy
+++ b/unlinked/kandora/dd_alchemy
@ -6,7 +6,7 @@ enter_x 16
 enter_y 8
 msg
 Created:  1999-02-28 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch woodfloor
@ -978,7 +978,7 @@ end
 arch woodfloor
 x 9
 end
-arch wwall_win2
+arch window_win2
 x 9
 end
 arch woodfloor
@ -1377,7 +1377,7 @@ y 4
 end
 arch card
 msg
-Guild Membership Car
+Guild Membership Card
 endmsg
 x 12
 y 4
--- a/unlinked/kandora/dd_inn
+++ b/unlinked/kandora/dd_inn
@ -4,6 +4,7 @@ width 14
 height 6
 msg
 Created:  1999-02-04 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch woodfloor
@ -19,7 +20,7 @@ end
 arch woodfloor
 y 2
 end
-arch wwall_win1
+arch window_win1
 y 2
 end
 arch woodfloor
@ -86,7 +87,7 @@ arch woodfloor
 x 1
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 1
 y 5
 end
@ -123,7 +124,7 @@ arch woodfloor
 x 2
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 2
 y 5
 end
@ -165,7 +166,7 @@ arch woodfloor
 x 3
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 3
 y 5
 end
@ -245,7 +246,7 @@ arch woodfloor
 x 5
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 5
 y 5
 end
@ -283,7 +284,7 @@ arch woodfloor
 x 6
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 6
 y 5
 end
@ -374,7 +375,7 @@ arch woodfloor
 x 8
 y 5
 end
-arch wwall_2_1_2
+arch wall_2_1_2
 x 8
 y 5
 end
@ -421,7 +422,7 @@ arch woodfloor
 x 9
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 9
 y 5
 end
@ -517,7 +518,7 @@ arch woodfloor
 x 11
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 11
 y 5
 end
@ -559,7 +560,7 @@ arch woodfloor
 x 12
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 12
 y 5
 end
@ -581,7 +582,7 @@ arch woodfloor
 x 13
 y 2
 end
-arch wwall_win1
+arch window_win1
 x 13
 y 2
 end
--- a/unlinked/kandora/dd_keep
+++ b/unlinked/kandora/dd_keep
@ -6,7 +6,7 @@ enter_x 14
 enter_y 14
 msg
 Created:  1999-02-28 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch dungeon_magic
@ -2119,10 +2119,6 @@ arch flagstone_2_1_2
 x 11
 y 13
 end
-arch flagstone
-x 11
-y 14
-end
 arch magic_ear
 msg
@match hope
@ -2133,6 +2129,10 @@ x 11
 y 14
 connected 1
 end
+arch flagstone
+x 11
+y 14
+end
 arch dungeon_magic
 x 11
 y 14
@ -2888,10 +2888,6 @@ arch dungeon_magic
 x 14
 y 19
 end
-arch flagstone
-x 14
-y 20
-end
 arch magic_mouth
 msg
 The throne room is empty of both queen
@ -2901,6 +2897,10 @@ endmsg
 x 14
 y 20
 end
+arch flagstone
+x 14
+y 20
+end
 arch dungeon_magic
 x 14
 y 20
--- a/unlinked/kandora/denray
+++ b/unlinked/kandora/denray
@ -5,7 +5,7 @@ height 16
 enter_x 15
 msg
 Created:  1999-02-03 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch cobblestones2
@ -1266,14 +1266,6 @@ arch cwall_3_2
 x 12
 y 7
 end
-arch cobblestones2
-x 12
-y 8
-end
-arch paved_1_3
-x 12
-y 8
-end
 arch magic_ear
 msg
@match Wilhema|wilhema
@ -1283,6 +1275,14 @@ x 12
 y 8
 connected 2
 end
+arch cobblestones2
+x 12
+y 8
+end
+arch paved_1_3
+x 12
+y 8
+end
 arch igateTrg2
 x 12
 y 8
@ -1417,6 +1417,13 @@ x 13
 y 7
 connected 3
 end
+arch magic_mouth
+msg
+What is the Queen's name
+endmsg
+x 13
+y 8
+end
 arch cobblestones2
 x 13
 y 8
@ -1425,13 +1432,6 @@ arch paved_2_1_2
 x 13
 y 8
 end
-arch magic_mouth
-msg
-What is the Queen's name
-endmsg
-x 13
-y 8
-end
 arch cobblestones2
 x 13
 y 9
@ -1557,14 +1557,6 @@ arch cwall_2_2_4
 x 14
 y 7
 end
-arch cobblestones2
-x 14
-y 8
-end
-arch paved_2_1_2
-x 14
-y 8
-end
 arch magic_ear
 msg
@match yes
@ -1574,6 +1566,14 @@ x 14
 y 8
 connected 1
 end
+arch cobblestones2
+x 14
+y 8
+end
+arch paved_2_1_2
+x 14
+y 8
+end
 arch igateTrg2
 x 14
 y 8
@ -1703,6 +1703,13 @@ arch paved_2_1_1
 x 15
 y 7
 end
+arch magic_mouth
+msg
+A voice shout: Are you a man of honor
+endmsg
+x 15
+y 8
+end
 arch cobblestones2
 x 15
 y 8
@ -1711,13 +1718,6 @@ arch paved_4
 x 15
 y 8
 end
-arch magic_mouth
-msg
-A voice shout: Are you a man of honor
-endmsg
-x 15
-y 8
-end
 arch cobblestones2
 x 15
 y 9
--- a/unlinked/kandora/dm_inn
+++ b/unlinked/kandora/dm_inn
@ -4,6 +4,7 @@ width 14
 height 6
 msg
 Created:  1999-02-04 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch woodfloor
@ -19,7 +20,7 @@ end
 arch woodfloor
 y 2
 end
-arch wwall_win1
+arch window_win1
 y 2
 end
 arch woodfloor
@ -74,7 +75,7 @@ arch woodfloor
 x 1
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 1
 y 5
 end
@ -122,7 +123,7 @@ arch woodfloor
 x 2
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 2
 y 5
 end
@ -160,7 +161,7 @@ arch woodfloor
 x 3
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 3
 y 5
 end
@ -240,7 +241,7 @@ arch woodfloor
 x 5
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 5
 y 5
 end
@ -278,7 +279,7 @@ arch woodfloor
 x 6
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 6
 y 5
 end
@ -369,7 +370,7 @@ arch woodfloor
 x 8
 y 5
 end
-arch wwall_2_1_2
+arch wall_2_1_2
 x 8
 y 5
 end
@ -412,7 +413,7 @@ arch woodfloor
 x 9
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 9
 y 5
 end
@ -504,7 +505,7 @@ arch woodfloor
 x 11
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 11
 y 5
 end
@ -559,7 +560,7 @@ arch woodfloor
 x 12
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 12
 y 5
 end
@ -581,7 +582,7 @@ arch woodfloor
 x 13
 y 2
 end
-arch wwall_win1
+arch window_win1
 x 13
 y 2
 end
--- a/unlinked/kandora/elcyon/merchant
+++ b/unlinked/kandora/elcyon/merchant
@ -5,6 +5,7 @@ height 11
 enter_x 15
 msg
 Created:  1999-02-03 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch woodfloor
@ -500,6 +501,10 @@ arch woodfloor
 x 5
 y 9
 end
+arch woodfloor
+x 5
+y 10
+end
 arch oakdoor
 slaying seacity
 hp 2
--- a/unlinked/kandora/elcyon/plaza
+++ b/unlinked/kandora/elcyon/plaza
@ -4,6 +4,7 @@ width 14
 height 6
 msg
 Created:  1999-02-04 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch woodfloor
@ -19,7 +20,7 @@ end
 arch woodfloor
 y 2
 end
-arch wwall_win1
+arch window_win1
 y 2
 end
 arch woodfloor
@ -86,7 +87,7 @@ arch woodfloor
 x 1
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 1
 y 5
 end
@ -123,7 +124,7 @@ arch woodfloor
 x 2
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 2
 y 5
 end
@ -170,7 +171,7 @@ arch woodfloor
 x 3
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 3
 y 5
 end
@ -250,7 +251,7 @@ arch woodfloor
 x 5
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 5
 y 5
 end
@ -288,7 +289,7 @@ arch woodfloor
 x 6
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 6
 y 5
 end
@ -379,7 +380,7 @@ arch woodfloor
 x 8
 y 5
 end
-arch wwall_2_1_2
+arch wall_2_1_2
 x 8
 y 5
 end
@ -426,7 +427,7 @@ arch woodfloor
 x 9
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 9
 y 5
 end
@ -522,7 +523,7 @@ arch woodfloor
 x 11
 y 5
 end
-arch wwall_weak_2
+arch wall_2_1_2
 x 11
 y 5
 end
@ -564,7 +565,7 @@ arch woodfloor
 x 12
 y 5
 end
-arch wwall_win2
+arch window_win2
 x 12
 y 5
 end
@ -586,7 +587,7 @@ arch woodfloor
 x 13
 y 2
 end
-arch wwall_win1
+arch window_win1
 x 13
 y 2
 end
--- a/unlinked/kandora/elcyon/seacity
+++ b/unlinked/kandora/elcyon/seacity
@ -6,7 +6,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1999-02-06 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch grass
@ -593,6 +593,18 @@ y 2
 end
 arch cobblestones
 x 7
+y 3
+end
+arch cobblestones
+x 7
+y 4
+end
+arch cobblestones
+x 7
+y 5
+end
+arch cobblestones
+x 7
 y 6
 end
 arch cobblestones
@ -675,6 +687,18 @@ y 2
 end
 arch cobblestones
 x 8
+y 3
+end
+arch cobblestones
+x 8
+y 4
+end
+arch cobblestones
+x 8
+y 5
+end
+arch cobblestones
+x 8
 y 6
 end
 arch cobblestones
--- a/unlinked/kandora/kandora
+++ b/unlinked/kandora/kandora
@ -4,6 +4,7 @@ width 40
 height 28
 msg
 Created:  1999-02-26 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch woods
@ -691,9 +692,16 @@ arch woods_3
 x 4
 y 27
 end
+arch hills_rocky
+x 5
+end
 arch mountain3
 x 5
 end
+arch hills_rocky
+x 5
+y 1
+end
 arch mountain3
 x 5
 y 1
@ -956,11 +964,6 @@ arch mountain4
 x 7
 y 4
 end
-arch mountain4
-x 7
-y 5
-move_block 0
-end
 arch magic_ear
 msg
@match mithril|Mithril
@ -972,11 +975,17 @@ x 7
 y 5
 connected 22
 end
+arch mountain4
+x 7
+y 5
+move_block 0
+end
 arch teleporter
 slaying cave/mithril
 sp 15
 x 7
 y 5
+speed 0.0
 invisible 1
 connected 22
 end
--- a/unlinked/kandora/ship_city
+++ b/unlinked/kandora/ship_city
@ -6,6 +6,7 @@ enter_x 7
 enter_y 14
 msg
 Created:  1999-02-28 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch grass
@ -39,12 +40,6 @@ end
 arch grass
 y 7
 end
-arch grass
-y 8
-end
-arch dirtroad_2_1_2
-y 8
-end
 arch invis_exit
 slaying kandora
 hp 33
@ -52,6 +47,12 @@ sp 15
 y 8
 end
 arch grass
+y 8
+end
+arch dirtroad_2_1_2
+y 8
+end
+arch grass
 y 9
 end
 arch grass
@ -900,6 +901,9 @@ x 10
 y 3
 end
 arch slum2
+slaying ship_home
+hp 1
+sp 10
 x 10
 y 3
 end
@ -971,6 +975,13 @@ arch dirtroad_2_1_1
 x 10
 y 13
 end
+arch invis_exit
+slaying kandora
+hp 34
+sp 17
+x 10
+y 14
+end
 arch grass
 x 10
 y 14
@ -979,13 +990,6 @@ arch dirtroad_2_1_1
 x 10
 y 14
 end
-arch invis_exit
-slaying kandora
-hp 34
-sp 17
-x 10
-y 14
-end
 arch sea
 x 11
 end
@ -1002,6 +1006,9 @@ x 11
 y 3
 end
 arch slum3
+slaying ship_home
+hp 1
+sp 10
 x 11
 y 3
 end
@ -1155,10 +1162,6 @@ arch pstone_2
 x 12
 y 13
 end
-arch pstone_2
-x 12
-y 14
-end
 arch invis_exit
 slaying ship_treasure
 hp 2
@ -1166,6 +1169,10 @@ sp 1
 x 12
 y 14
 end
+arch pstone_2
+x 12
+y 14
+end
 arch sea
 x 13
 end
--- a/unlinked/kandora/ship_home
+++ b/unlinked/kandora/ship_home
@ -6,6 +6,7 @@ enter_x 3
 enter_y 10
 msg
 Created:  1999-02-03 King Zoobus
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch sea
@ -47,6 +48,9 @@ arch woodfloor
 y 9
 end
 arch slum2
+slaying ship_city
+hp 9
+sp 4
 y 9
 end
 arch woodfloor
@ -326,9 +330,9 @@ y 3
 end
 arch s_ship
 name Long Ship
-slaying /city/city
-hp 22
-sp 4
+slaying /world/world_105_115
+hp 0
+sp 20
 x 6
 y 3
 end
@ -340,6 +344,13 @@ arch dungeon_magic
 x 6
 y 4
 end
+arch magic_mouth
+msg
+A long, hard voyage awaits you
+endmsg
+x 6
+y 5
+end
 arch sea
 x 6
 y 5
@ -352,13 +363,6 @@ arch dungeon_magic
 x 6
 y 5
 end
-arch magic_mouth
-msg
-A long, hard voyage awaits you
-endmsg
-x 6
-y 5
-end
 arch sea
 x 6
 y 6
--- a/unlinked/kandora/signal
+++ b/unlinked/kandora/signal
@ -5,7 +5,7 @@ height 14
 enter_x 1
 msg
 Created:  1999-02-28 King Zoobus
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-06-03 Arvid Norlander
 endmsg
 end
 arch cobblestones2
@ -576,9 +576,6 @@ arch dwall_2_1_2
 x 5
 y 13
 end
-arch cobblestones2
-x 6
-end
 arch magic_mouth
 msg
 A gruff voice shouts, "What ya want?!
@ -587,7 +584,6 @@ x 6
 end
 arch cobblestones2
 x 6
-y 1
 end
 arch magic_ear
 msg
@ -598,6 +594,10 @@ x 6
 y 1
 connected 7
 end
+arch cobblestones2
+x 6
+y 1
+end
 arch igateTrg1
 x 6
 y 1