From 80f7db44ce442e7ae12b0e910906564dc85b951c Mon Sep 17 00:00:00 2001
From: partmedia <partmedia@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 26 Jul 2013 10:49:25 +0000
Subject: [PATCH] Fix troll canyon map tiling.

It's not a good idea to have tiles overlap each other; this tends to
confuse the client. Move the tile below the other tile onto a separate
map to solve this problem. Also fix tiles for entire map.

Take this opportunity to better connect elements of the map.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18838 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 .../troll_canyon/{troll_canyon.8 => basement} | 925 ++++++++----------
 navar_city/troll_canyon/troll_canyon.10       |  22 +-
 navar_city/troll_canyon/troll_canyon.12       |  20 +-
 navar_city/troll_canyon/troll_canyon.2        |  32 +-
 navar_city/troll_canyon/troll_canyon.4        | 123 +--
 navar_city/troll_canyon/troll_canyon.5        |   3 +-
 navar_city/troll_canyon/troll_canyon.7        |  78 +-
 navar_city/troll_canyon/troll_canyon.9        |   3 +-
 8 files changed, 546 insertions(+), 660 deletions(-)
 rename navar_city/troll_canyon/{troll_canyon.8 => basement} (91%)

diff --git a/navar_city/troll_canyon/troll_canyon.8 b/navar_city/troll_canyon/basement
similarity index 91%
rename from navar_city/troll_canyon/troll_canyon.8
rename to navar_city/troll_canyon/basement
index a43a6fa34..b765b983a 100755
--- a/navar_city/troll_canyon/troll_canyon.8
+++ b/navar_city/troll_canyon/basement
@@ -1,16 +1,15 @@
 arch map
-name Troll Canyon Cavern
+name Troll Canyon Cavern Basement
 difficulty 30
 region navar
 width 20
-height 20
+height 18
 enter_x 6
 enter_y 19
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2013-07-26 Kevin Zheng
 endmsg
-tile_path_3 troll_canyon.7
 end
 arch cave_15
 end
@@ -66,12 +65,6 @@ arch cave_15
 y 17
 end
 arch cave_15
-y 18
-end
-arch cave_15
-y 19
-end
-arch cave_15
 x 1
 end
 arch cave_15
@@ -118,20 +111,20 @@ arch cave_15
 x 1
 y 11
 end
-arch cave_15
-x 1
-y 12
-end
-arch cave_15
-x 1
-y 13
-end
 arch cave18
 x 1
-y 14
+y 12
 end
 arch cave17
 x 1
+y 13
+end
+arch cave_15
+x 1
+y 14
+end
+arch cave_15
+x 1
 y 15
 end
 arch cave_15
@@ -143,14 +136,6 @@ x 1
 y 17
 end
 arch cave_15
-x 1
-y 18
-end
-arch cave_15
-x 1
-y 19
-end
-arch cave_15
 x 2
 end
 arch cave_15
@@ -193,36 +178,36 @@ arch cave_15
 x 2
 y 10
 end
-arch cave_15
+arch cave24
 x 2
 y 11
 end
-arch cave_15
+arch pstone_2
 x 2
 y 12
 end
-arch cave24
-x 2
-y 13
-end
-arch pstone_2
-x 2
-y 14
-end
 arch cave13
 x 2
-y 14
+y 12
 end
 arch pstone_2
 x 2
-y 15
+y 13
 end
 arch cave7
 x 2
-y 15
+y 13
 end
 arch cave23
 x 2
+y 14
+end
+arch cave_15
+x 2
+y 15
+end
+arch cave_15
+x 2
 y 16
 end
 arch cave_15
@@ -230,14 +215,6 @@ x 2
 y 17
 end
 arch cave_15
-x 2
-y 18
-end
-arch cave_15
-x 2
-y 19
-end
-arch cave_15
 x 3
 end
 arch cave_15
@@ -268,15 +245,23 @@ arch cave_15
 x 3
 y 7
 end
-arch cave_15
+arch cave24
 x 3
 y 8
 end
-arch cave_15
+arch pstone_2
 x 3
 y 9
 end
-arch cave24
+arch cave3
+x 3
+y 9
+end
+arch pstone_2
+x 3
+y 10
+end
+arch cave3
 x 3
 y 10
 end
@@ -284,7 +269,7 @@ arch pstone_2
 x 3
 y 11
 end
-arch cave3
+arch cave9
 x 3
 y 11
 end
@@ -292,22 +277,6 @@ arch pstone_2
 x 3
 y 12
 end
-arch cave3
-x 3
-y 12
-end
-arch pstone_2
-x 3
-y 13
-end
-arch cave9
-x 3
-y 13
-end
-arch pstone_2
-x 3
-y 14
-end
 arch small_troll
 name stout small troll
 hp 180
@@ -316,35 +285,35 @@ exp 900
 dam 20
 wc -4
 x 3
-y 14
+y 12
 level 14
 resist_acid 50
 end
 arch pstone_2
 x 3
-y 15
+y 13
 end
 arch pstone_2
 x 3
-y 16
+y 14
 end
 arch cave12
 x 3
-y 16
+y 14
 end
 arch cave23
 x 3
+y 15
+end
+arch cave_15
+x 3
+y 16
+end
+arch cave_15
+x 3
 y 17
 end
 arch cave_15
-x 3
-y 18
-end
-arch cave_15
-x 3
-y 19
-end
-arch cave_15
 x 4
 end
 arch cave_15
@@ -371,39 +340,39 @@ arch cave_15
 x 4
 y 6
 end
-arch cave_15
-x 4
-y 7
-end
-arch cave_15
-x 4
-y 8
-end
 arch cave18
 x 4
-y 9
+y 7
 end
 arch pstone_1
 x 4
-y 10
+y 8
 end
 arch cave8
 x 4
-y 10
+y 8
 end
 arch pstone_1
 x 4
+y 9
+end
+arch pstone_2
+x 4
+y 10
+end
+arch pstone_2
+x 4
 y 11
 end
 arch pstone_2
 x 4
 y 12
 end
-arch pstone_2
+arch pstone_1
 x 4
 y 13
 end
-arch pstone_2
+arch pstone_1
 x 4
 y 14
 end
@@ -411,33 +380,25 @@ arch pstone_1
 x 4
 y 15
 end
-arch pstone_1
-x 4
-y 16
-end
-arch pstone_1
-x 4
-y 17
-end
 arch cave12
 x 4
+y 15
+end
+arch pstone_2
+x 4
+y 16
+end
+arch cave3
+x 4
+y 16
+end
+arch pstone_2
+x 4
 y 17
 end
-arch pstone_2
+arch cave23
 x 4
-y 18
-end
-arch cave3
-x 4
-y 18
-end
-arch pstone_2
-x 4
-y 19
-end
-arch cave3
-x 4
-y 19
+y 17
 end
 arch cave_15
 x 5
@@ -462,15 +423,19 @@ arch cave_15
 x 5
 y 5
 end
-arch cave_15
+arch cave24
 x 5
 y 6
 end
-arch cave_15
+arch pstone_2
 x 5
 y 7
 end
-arch cave24
+arch cave8
+x 5
+y 7
+end
+arch pstone_2
 x 5
 y 8
 end
@@ -478,18 +443,22 @@ arch pstone_2
 x 5
 y 9
 end
-arch cave8
-x 5
-y 9
-end
 arch pstone_2
 x 5
 y 10
 end
+arch random_food
+x 5
+y 10
+end
 arch pstone_2
 x 5
 y 11
 end
+arch random_food
+x 5
+y 11
+end
 arch pstone_2
 x 5
 y 12
@@ -498,7 +467,7 @@ arch pstone_2
 x 5
 y 13
 end
-arch pstone_2
+arch pstone_1
 x 5
 y 14
 end
@@ -506,7 +475,7 @@ arch pstone_2
 x 5
 y 15
 end
-arch pstone_1
+arch pstone_2
 x 5
 y 16
 end
@@ -514,13 +483,9 @@ arch pstone_2
 x 5
 y 17
 end
-arch pstone_2
+arch cave2
 x 5
-y 18
-end
-arch pstone_2
-x 5
-y 19
+y 17
 end
 arch cave_15
 x 6
@@ -541,38 +506,30 @@ arch cave_15
 x 6
 y 4
 end
-arch cave_15
+arch cave24
 x 6
 y 5
 end
-arch cave_15
-x 6
-y 6
-end
-arch cave24
-x 6
-y 7
-end
 arch pstone_2
 x 6
-y 8
+y 6
 end
 arch cave9
 x 6
+y 6
+end
+arch pstone_2
+x 6
+y 7
+end
+arch pstone_2
+x 6
 y 8
 end
 arch pstone_2
 x 6
 y 9
 end
-arch pstone_2
-x 6
-y 10
-end
-arch pstone_2
-x 6
-y 11
-end
 arch gaelotroll
 name Bridge Troll
 msg
@@ -584,7 +541,7 @@ maxhp 6000
 exp 140000
 dam 30
 x 6
-y 11
+y 9
 level 24
 resist_physical 65
 resist_acid 50
@@ -592,6 +549,14 @@ resist_poison 50
 end
 arch pstone_2
 x 6
+y 10
+end
+arch pstone_2
+x 6
+y 11
+end
+arch pstone_2
+x 6
 y 12
 end
 arch pstone_2
@@ -610,17 +575,20 @@ arch pstone_2
 x 6
 y 16
 end
+arch stair_up_3
+slaying troll_canyon.7
+hp 6
+sp 1
+x 6
+y 16
+end
 arch pstone_2
 x 6
 y 17
 end
-arch pstone_2
+arch cave2
 x 6
-y 18
-end
-arch pstone_2
-x 6
-y 19
+y 17
 end
 arch cave_15
 x 7
@@ -641,20 +609,20 @@ arch cave_15
 x 7
 y 4
 end
-arch cave_15
-x 7
-y 5
-end
-arch cave_15
-x 7
-y 6
-end
 arch pstone_2
 x 7
-y 7
+y 5
 end
 arch cave4
 x 7
+y 5
+end
+arch pstone_2
+x 7
+y 6
+end
+arch pstone_2
+x 7
 y 7
 end
 arch pstone_2
@@ -665,7 +633,7 @@ arch pstone_2
 x 7
 y 9
 end
-arch pstone_2
+arch pstone_1
 x 7
 y 10
 end
@@ -673,7 +641,7 @@ arch pstone_2
 x 7
 y 11
 end
-arch pstone_1
+arch pstone_2
 x 7
 y 12
 end
@@ -689,21 +657,24 @@ arch pstone_2
 x 7
 y 15
 end
-arch pstone_2
+arch pstone_1
 x 7
 y 16
 end
-arch pstone_2
+arch stair_up_3
+slaying troll_canyon.7
+hp 7
+sp 1
+x 7
+y 16
+end
+arch pstone_1
 x 7
 y 17
 end
-arch pstone_1
+arch cave2
 x 7
-y 18
-end
-arch pstone_1
-x 7
-y 19
+y 17
 end
 arch cave_15
 x 8
@@ -712,15 +683,23 @@ arch cave_15
 x 8
 y 1
 end
-arch cave_15
+arch cave24
 x 8
 y 2
 end
-arch cave_15
+arch pstone_2
 x 8
 y 3
 end
-arch cave24
+arch cave3
+x 8
+y 3
+end
+arch pstone_2
+x 8
+y 4
+end
+arch cave3
 x 8
 y 4
 end
@@ -728,47 +707,43 @@ arch pstone_2
 x 8
 y 5
 end
-arch cave3
-x 8
-y 5
-end
-arch pstone_2
-x 8
-y 6
-end
-arch cave3
-x 8
-y 6
-end
-arch pstone_2
-x 8
-y 7
-end
 arch cave13
 x 8
-y 7
+y 5
 end
 arch pstone_1
 x 8
+y 6
+end
+arch pstone_2
+x 8
+y 7
+end
+arch random_food
+x 8
+y 7
+end
+arch pstone_2
+x 8
 y 8
 end
 arch pstone_2
 x 8
 y 9
 end
-arch pstone_2
+arch pstone_1
 x 8
 y 10
 end
-arch pstone_2
+arch pstone_1
 x 8
 y 11
 end
-arch pstone_1
+arch pstone_2
 x 8
 y 12
 end
-arch pstone_1
+arch pstone_2
 x 8
 y 13
 end
@@ -784,30 +759,30 @@ arch pstone_2
 x 8
 y 16
 end
-arch pstone_2
+arch pstone_1
 x 8
 y 17
 end
-arch pstone_2
+arch cave2
 x 8
-y 18
-end
-arch pstone_1
-x 8
-y 19
+y 17
 end
 arch cave_15
 x 9
 end
-arch cave_15
+arch cave24
 x 9
 y 1
 end
-arch cave_15
+arch pstone_2
 x 9
 y 2
 end
-arch cave24
+arch cave8
+x 9
+y 2
+end
+arch pstone_2
 x 9
 y 3
 end
@@ -815,27 +790,27 @@ arch pstone_2
 x 9
 y 4
 end
-arch cave8
-x 9
-y 4
-end
 arch pstone_2
 x 9
 y 5
 end
-arch pstone_2
+arch pstone_1
 x 9
 y 6
 end
-arch pstone_2
+arch random_food
+x 9
+y 6
+end
+arch pstone_1
 x 9
 y 7
 end
-arch pstone_1
+arch pstone_2
 x 9
 y 8
 end
-arch pstone_1
+arch pstone_2
 x 9
 y 9
 end
@@ -851,14 +826,6 @@ arch pstone_2
 x 9
 y 12
 end
-arch pstone_2
-x 9
-y 13
-end
-arch pstone_2
-x 9
-y 14
-end
 arch gaelotroll
 name Bridge Troll
 msg
@@ -870,7 +837,7 @@ maxhp 6000
 exp 140000
 dam 30
 x 9
-y 14
+y 12
 level 24
 resist_physical 65
 resist_acid 50
@@ -878,66 +845,58 @@ resist_poison 50
 end
 arch pstone_2
 x 9
+y 13
+end
+arch pstone_2
+x 9
+y 14
+end
+arch pstone_2
+x 9
+y 15
+end
+arch cave15
+x 9
 y 15
 end
 arch pstone_2
 x 9
 y 16
 end
-arch pstone_2
-x 9
-y 17
-end
-arch cave15
-x 9
-y 17
-end
-arch pstone_2
-x 9
-y 18
-end
 arch cave1
 x 9
-y 18
+y 16
 end
 arch pstone_1
 x 9
-y 19
+y 17
 end
-arch cave1
+arch cave22
 x 9
-y 19
-end
-arch cave_15
-x 10
-end
-arch cave_15
-x 10
-y 1
+y 17
 end
 arch cave24
 x 10
-y 2
 end
 arch pstone_2
 x 10
-y 3
+y 1
 end
 arch cave8
 x 10
-y 3
+y 1
 end
 arch pstone_2
 x 10
-y 4
+y 2
 end
 arch mountain_stone
 x 10
-y 4
+y 2
 end
 arch pstone_2
 x 10
-y 5
+y 3
 end
 arch small_troll
 name stout small troll
@@ -947,12 +906,20 @@ exp 900
 dam 20
 wc -4
 x 10
-y 5
+y 3
 level 14
 resist_acid 50
 end
 arch pstone_2
 x 10
+y 4
+end
+arch pstone_2
+x 10
+y 5
+end
+arch pstone_2
+x 10
 y 6
 end
 arch pstone_2
@@ -963,14 +930,6 @@ arch pstone_2
 x 10
 y 8
 end
-arch pstone_2
-x 10
-y 9
-end
-arch pstone_2
-x 10
-y 10
-end
 arch gaelotroll
 name Bridge Troll
 msg
@@ -982,7 +941,7 @@ maxhp 6000
 exp 140000
 dam 30
 x 10
-y 10
+y 8
 level 24
 resist_physical 65
 resist_acid 50
@@ -990,6 +949,14 @@ resist_poison 50
 end
 arch pstone_2
 x 10
+y 9
+end
+arch pstone_2
+x 10
+y 10
+end
+arch pstone_2
+x 10
 y 11
 end
 arch pstone_2
@@ -1008,34 +975,30 @@ arch pstone_2
 x 10
 y 15
 end
-arch pstone_2
-x 10
-y 16
-end
-arch pstone_2
-x 10
-y 17
-end
 arch cave16
 x 10
-y 17
+y 15
 end
 arch cave23
 x 10
-y 18
+y 16
 end
 arch cave_15
 x 10
-y 19
+y 17
 end
-arch cave_15
+arch cave25
 x 11
 end
-arch cave_15
+arch pstone_2
 x 11
 y 1
 end
-arch cave25
+arch cave5
+x 11
+y 1
+end
+arch pstone_2
 x 11
 y 2
 end
@@ -1043,18 +1006,6 @@ arch pstone_2
 x 11
 y 3
 end
-arch cave5
-x 11
-y 3
-end
-arch pstone_2
-x 11
-y 4
-end
-arch pstone_2
-x 11
-y 5
-end
 arch small_troll
 name stout small troll
 hp 180
@@ -1063,24 +1014,32 @@ exp 900
 dam 20
 wc -4
 x 11
-y 5
+y 3
 level 14
 resist_acid 50
 end
 arch pstone_2
 x 11
+y 4
+end
+arch pstone_2
+x 11
+y 5
+end
+arch pstone_2
+x 11
 y 6
 end
-arch pstone_2
-x 11
-y 7
-end
-arch pstone_2
-x 11
-y 8
-end
 arch cave21
 x 11
+y 6
+end
+arch pstone_2
+x 11
+y 7
+end
+arch pstone_2
+x 11
 y 8
 end
 arch pstone_2
@@ -1115,34 +1074,30 @@ arch pstone_2
 x 11
 y 16
 end
-arch pstone_2
+arch cave2
+x 11
+y 16
+end
+arch cave_15
 x 11
 y 17
 end
-arch pstone_2
-x 11
-y 18
-end
-arch cave2
-x 11
-y 18
-end
-arch cave_15
-x 11
-y 19
-end
 arch cave_15
 x 12
 end
-arch cave_15
+arch cave19
 x 12
 y 1
 end
-arch cave_15
+arch pstone_2
 x 12
 y 2
 end
-arch cave19
+arch cave14
+x 12
+y 2
+end
+arch pstone_2
 x 12
 y 3
 end
@@ -1150,10 +1105,6 @@ arch pstone_2
 x 12
 y 4
 end
-arch cave14
-x 12
-y 4
-end
 arch pstone_2
 x 12
 y 5
@@ -1182,19 +1133,19 @@ arch pstone_2
 x 12
 y 11
 end
-arch pstone_2
+arch pstone_1
 x 12
 y 12
 end
-arch pstone_2
+arch pstone_1
 x 12
 y 13
 end
-arch pstone_1
+arch pstone_2
 x 12
 y 14
 end
-arch pstone_1
+arch pstone_2
 x 12
 y 15
 end
@@ -1202,21 +1153,13 @@ arch pstone_2
 x 12
 y 16
 end
-arch pstone_2
-x 12
-y 17
-end
-arch pstone_2
-x 12
-y 18
-end
 arch cave2
 x 12
-y 18
+y 16
 end
 arch cave_15
 x 12
-y 19
+y 17
 end
 arch cave_15
 x 13
@@ -1225,15 +1168,19 @@ arch cave_15
 x 13
 y 1
 end
-arch cave_15
+arch cave19
 x 13
 y 2
 end
-arch cave_15
+arch pstone_2
 x 13
 y 3
 end
-arch cave19
+arch cave14
+x 13
+y 3
+end
+arch pstone_2
 x 13
 y 4
 end
@@ -1241,19 +1188,23 @@ arch pstone_2
 x 13
 y 5
 end
-arch cave14
-x 13
-y 5
-end
 arch pstone_2
 x 13
 y 6
 end
+arch random_food
+x 13
+y 6
+end
 arch pstone_2
 x 13
 y 7
 end
-arch pstone_2
+arch random_food
+x 13
+y 7
+end
+arch pstone_1
 x 13
 y 8
 end
@@ -1261,15 +1212,19 @@ arch pstone_2
 x 13
 y 9
 end
-arch pstone_1
+arch pstone_2
 x 13
 y 10
 end
-arch pstone_2
+arch pstone_1
 x 13
 y 11
 end
-arch pstone_2
+arch random_food
+x 13
+y 11
+end
+arch pstone_1
 x 13
 y 12
 end
@@ -1277,11 +1232,11 @@ arch pstone_1
 x 13
 y 13
 end
-arch pstone_1
+arch pstone_2
 x 13
 y 14
 end
-arch pstone_1
+arch pstone_2
 x 13
 y 15
 end
@@ -1289,21 +1244,13 @@ arch pstone_2
 x 13
 y 16
 end
-arch pstone_2
-x 13
-y 17
-end
-arch pstone_2
-x 13
-y 18
-end
 arch cave2
 x 13
-y 18
+y 16
 end
 arch cave_15
 x 13
-y 19
+y 17
 end
 arch cave_15
 x 14
@@ -1316,15 +1263,19 @@ arch cave_15
 x 14
 y 2
 end
-arch cave_15
+arch cave19
 x 14
 y 3
 end
-arch cave_15
+arch pstone_2
 x 14
 y 4
 end
-arch cave19
+arch cave14
+x 14
+y 4
+end
+arch pstone_2
 x 14
 y 5
 end
@@ -1332,15 +1283,15 @@ arch pstone_2
 x 14
 y 6
 end
-arch cave14
-x 14
-y 6
-end
 arch pstone_2
 x 14
 y 7
 end
-arch pstone_2
+arch pstone_1
+x 14
+y 8
+end
+arch random_food
 x 14
 y 8
 end
@@ -1348,7 +1299,11 @@ arch pstone_2
 x 14
 y 9
 end
-arch pstone_1
+arch random_food
+x 14
+y 9
+end
+arch pstone_2
 x 14
 y 10
 end
@@ -1356,11 +1311,15 @@ arch pstone_2
 x 14
 y 11
 end
-arch pstone_2
+arch pstone_1
 x 14
 y 12
 end
-arch pstone_2
+arch random_food
+x 14
+y 12
+end
+arch pstone_1
 x 14
 y 13
 end
@@ -1368,29 +1327,21 @@ arch pstone_1
 x 14
 y 14
 end
-arch pstone_1
+arch pstone_2
 x 14
 y 15
 end
-arch pstone_1
+arch pstone_2
 x 14
 y 16
 end
-arch pstone_2
-x 14
-y 17
-end
-arch pstone_2
-x 14
-y 18
-end
 arch cave16
 x 14
-y 18
+y 16
 end
 arch cave23
 x 14
-y 19
+y 17
 end
 arch cave_15
 x 15
@@ -1407,15 +1358,19 @@ arch cave_15
 x 15
 y 3
 end
-arch cave_15
+arch cave25
 x 15
 y 4
 end
-arch cave_15
+arch pstone_2
 x 15
 y 5
 end
-arch cave25
+arch cave10
+x 15
+y 5
+end
+arch pstone_2
 x 15
 y 6
 end
@@ -1423,39 +1378,51 @@ arch pstone_2
 x 15
 y 7
 end
-arch cave10
-x 15
-y 7
-end
-arch pstone_2
+arch pstone_1
 x 15
 y 8
 end
-arch pstone_2
+arch pstone_1
 x 15
 y 9
 end
-arch pstone_1
+arch random_food
+x 15
+y 9
+end
+arch pstone_2
 x 15
 y 10
 end
-arch pstone_1
+arch random_food
+x 15
+y 10
+end
+arch pstone_2
 x 15
 y 11
 end
-arch pstone_2
+arch random_food
+x 15
+y 11
+end
+arch pstone_1
 x 15
 y 12
 end
-arch pstone_2
+arch pstone_1
 x 15
 y 13
 end
-arch pstone_1
+arch pstone_2
 x 15
 y 14
 end
-arch pstone_1
+arch pstone_2
+x 15
+y 15
+end
+arch rubble
 x 15
 y 15
 end
@@ -1463,25 +1430,17 @@ arch pstone_2
 x 15
 y 16
 end
-arch pstone_2
-x 15
-y 17
-end
-arch pstone_2
-x 15
-y 18
-end
 arch random_gem
 x 15
-y 18
+y 16
 end
 arch pstone_2
 x 15
-y 19
+y 17
 end
 arch cave2
 x 15
-y 19
+y 17
 end
 arch cave_15
 x 16
@@ -1502,15 +1461,23 @@ arch cave_15
 x 16
 y 4
 end
-arch cave_15
+arch cave25
 x 16
 y 5
 end
-arch cave_15
+arch pstone_2
 x 16
 y 6
 end
-arch cave25
+arch cave1
+x 16
+y 6
+end
+arch pstone_2
+x 16
+y 7
+end
+arch cave1
 x 16
 y 7
 end
@@ -1518,7 +1485,7 @@ arch pstone_2
 x 16
 y 8
 end
-arch cave1
+arch cave5
 x 16
 y 8
 end
@@ -1526,15 +1493,11 @@ arch pstone_2
 x 16
 y 9
 end
-arch cave1
-x 16
-y 9
-end
 arch pstone_2
 x 16
 y 10
 end
-arch cave5
+arch random_food
 x 16
 y 10
 end
@@ -1562,21 +1525,13 @@ arch pstone_2
 x 16
 y 16
 end
-arch pstone_2
-x 16
-y 17
-end
-arch pstone_2
-x 16
-y 18
-end
 arch cave15
 x 16
-y 18
+y 16
 end
 arch cave22
 x 16
-y 19
+y 17
 end
 arch cave_15
 x 17
@@ -1609,24 +1564,24 @@ arch cave_15
 x 17
 y 7
 end
-arch cave_15
-x 17
-y 8
-end
-arch cave_15
-x 17
-y 9
-end
 arch cave19
 x 17
-y 10
+y 8
 end
 arch pstone_2
 x 17
-y 11
+y 9
 end
 arch cave5
 x 17
+y 9
+end
+arch pstone_2
+x 17
+y 10
+end
+arch pstone_2
+x 17
 y 11
 end
 arch pstone_2
@@ -1649,21 +1604,13 @@ arch pstone_2
 x 17
 y 16
 end
-arch pstone_2
-x 17
-y 17
-end
-arch pstone_2
-x 17
-y 18
-end
 arch cave16
 x 17
-y 18
+y 16
 end
 arch cave23
 x 17
-y 19
+y 17
 end
 arch cave_15
 x 18
@@ -1700,23 +1647,27 @@ arch cave_15
 x 18
 y 8
 end
-arch cave_15
+arch cave25
 x 18
 y 9
 end
-arch cave_15
+arch pstone_2
 x 18
 y 10
 end
-arch cave25
+arch cave10
 x 18
-y 11
+y 10
 end
 arch pstone_2
 x 18
+y 11
+end
+arch pstone_1
+x 18
 y 12
 end
-arch cave10
+arch cave15
 x 18
 y 12
 end
@@ -1724,30 +1675,18 @@ arch pstone_2
 x 18
 y 13
 end
-arch pstone_1
-x 18
-y 14
-end
-arch cave15
-x 18
-y 14
-end
-arch pstone_2
-x 18
-y 15
-end
 arch cave14
 x 18
+y 13
+end
+arch pstone_2
+x 18
+y 14
+end
+arch pstone_2
+x 18
 y 15
 end
-arch pstone_2
-x 18
-y 16
-end
-arch pstone_2
-x 18
-y 17
-end
 arch small_troll
 name stout small troll
 hp 180
@@ -1756,21 +1695,21 @@ exp 900
 dam 20
 wc -4
 x 18
-y 17
+y 15
 level 14
 resist_acid 50
 end
 arch pstone_2
 x 18
-y 18
+y 16
 end
 arch cave11
 x 18
-y 18
+y 16
 end
 arch cave22
 x 18
-y 19
+y 17
 end
 arch cave_15
 x 19
@@ -1811,15 +1750,19 @@ arch cave_15
 x 19
 y 9
 end
-arch cave_15
+arch cave25
 x 19
 y 10
 end
-arch cave_15
+arch pstone_2
 x 19
 y 11
 end
-arch cave25
+arch cave1
+x 19
+y 11
+end
+arch cave22
 x 19
 y 12
 end
@@ -1827,11 +1770,15 @@ arch pstone_2
 x 19
 y 13
 end
-arch cave1
+arch cave25
 x 19
 y 13
 end
-arch cave22
+arch pstone_2
+x 19
+y 14
+end
+arch cave1
 x 19
 y 14
 end
@@ -1839,31 +1786,15 @@ arch pstone_2
 x 19
 y 15
 end
-arch cave25
+arch cave1
 x 19
 y 15
 end
-arch pstone_2
-x 19
-y 16
-end
-arch cave1
-x 19
-y 16
-end
-arch pstone_2
-x 19
-y 17
-end
-arch cave1
-x 19
-y 17
-end
 arch cave22
 x 19
-y 18
+y 16
 end
 arch cave_15
 x 19
-y 19
+y 17
 end
diff --git a/navar_city/troll_canyon/troll_canyon.10 b/navar_city/troll_canyon/troll_canyon.10
index 9c5815c50..55559f82e 100755
--- a/navar_city/troll_canyon/troll_canyon.10
+++ b/navar_city/troll_canyon/troll_canyon.10
@@ -7,7 +7,7 @@ height 20
 enter_y 10
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2013-07-26 Kevin Zheng
 endmsg
 tile_path_1 troll_canyon.11
 tile_path_4 troll_canyon.9
@@ -62,16 +62,28 @@ end
 arch cave17
 y 13
 end
-arch cave_15
+arch shallow_sea
 y 14
 end
-arch cave_15
+arch cave25
+y 14
+end
+arch shallow_sea
 y 15
 end
-arch cave_15
+arch cave1
+y 15
+end
+arch shallow_sea
 y 16
 end
-arch cave_15
+arch cave1
+y 16
+end
+arch shallow_sea
+y 17
+end
+arch cave22
 y 17
 end
 arch cave_15
diff --git a/navar_city/troll_canyon/troll_canyon.12 b/navar_city/troll_canyon/troll_canyon.12
index e1ba7339e..09f551a4a 100755
--- a/navar_city/troll_canyon/troll_canyon.12
+++ b/navar_city/troll_canyon/troll_canyon.12
@@ -8,7 +8,7 @@ enter_x 19
 enter_y 9
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2013-07-26 Kevin Zheng
 endmsg
 tile_path_2 troll_canyon.11
 tile_path_3 troll_canyon.9
@@ -840,6 +840,14 @@ arch pstone_2
 x 8
 y 2
 end
+arch sign_e
+msg
+trol den
+we liv here
+endmsg
+x 8
+y 2
+end
 arch pstone_2
 x 8
 y 3
@@ -926,12 +934,18 @@ arch pstone_2
 x 9
 y 1
 end
+arch magic_mouth
+msg
+You get the feeling that you won't find the troll chief down here...
+endmsg
+x 9
+y 2
+end
 arch pstone_2
 x 9
 y 2
 end
-arch chole_1
-name Troll Den
+arch stair_3_down
 slaying /!
 msg
 layoutstyle rogue
diff --git a/navar_city/troll_canyon/troll_canyon.2 b/navar_city/troll_canyon/troll_canyon.2
index ab8301184..47d9b1a08 100755
--- a/navar_city/troll_canyon/troll_canyon.2
+++ b/navar_city/troll_canyon/troll_canyon.2
@@ -1791,19 +1791,27 @@ arch cave_15
 x 18
 y 15
 end
-arch cave_15
+arch cave24
 x 18
 y 16
 end
-arch cave_15
+arch shallow_sea
 x 18
 y 17
 end
-arch cave_15
+arch cave3
+x 18
+y 17
+end
+arch shallow_sea
 x 18
 y 18
 end
-arch cave_15
+arch cave3
+x 18
+y 18
+end
+arch cave23
 x 18
 y 19
 end
@@ -1886,19 +1894,27 @@ arch cave_15
 x 19
 y 15
 end
-arch cave_15
+arch shallow_sea
 x 19
 y 16
 end
-arch cave_15
+arch cave4
+x 19
+y 16
+end
+arch shallow_sea
 x 19
 y 17
 end
-arch cave_15
+arch shallow_sea
 x 19
 y 18
 end
-arch cave_15
+arch shallow_sea
+x 19
+y 19
+end
+arch cave2
 x 19
 y 19
 end
diff --git a/navar_city/troll_canyon/troll_canyon.4 b/navar_city/troll_canyon/troll_canyon.4
index a1daef46d..199c944b9 100755
--- a/navar_city/troll_canyon/troll_canyon.4
+++ b/navar_city/troll_canyon/troll_canyon.4
@@ -7,10 +7,11 @@ height 20
 enter_x 9
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2013-07-26 Kevin Zheng
 endmsg
 tile_path_1 troll_canyon.3
 tile_path_2 troll_canyon.5
+tile_path_3 troll_canyon.7
 end
 arch cave_15
 end
@@ -1504,58 +1505,16 @@ arch cave4
 x 14
 y 13
 end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
+arch pstone_2
 x 14
 y 14
 end
 arch pstone_2
 x 14
-y 14
-end
-arch chole_1
-slaying troll_canyon.8
-hp 14
-sp 14
-x 14
-y 14
-end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
-x 14
 y 15
 end
 arch pstone_2
 x 14
-y 15
-end
-arch chole_1
-slaying troll_canyon.8
-hp 14
-sp 15
-x 14
-y 15
-end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
-x 14
-y 16
-end
-arch pstone_2
-x 14
-y 16
-end
-arch chole_1
-slaying troll_canyon.8
-hp 14
-sp 16
-x 14
 y 16
 end
 arch pstone_2
@@ -1641,27 +1600,14 @@ arch cave4
 x 15
 y 13
 end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
-x 15
-y 14
-end
 arch pstone_2
 x 15
 y 14
 end
-arch chole_1
-slaying troll_canyon.8
-hp 15
-sp 14
-x 15
-y 14
-end
 arch magic_mouth
 msg
-Looks like a long way down.
+Looks like a long way down...
+You probably won't be able to climb back out of this hole.
 endmsg
 x 15
 y 15
@@ -1671,30 +1617,16 @@ x 15
 y 15
 end
 arch chole_1
-slaying troll_canyon.8
+slaying basement
 hp 15
 sp 15
 x 15
 y 15
 end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
-x 15
-y 16
-end
 arch pstone_2
 x 15
 y 16
 end
-arch chole_1
-slaying troll_canyon.8
-hp 15
-sp 16
-x 15
-y 16
-end
 arch pstone_2
 x 15
 y 17
@@ -1789,58 +1721,23 @@ arch cave4
 x 16
 y 13
 end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
+arch pstone_2
 x 16
 y 14
 end
 arch pstone_2
 x 16
-y 14
+y 15
 end
-arch chole_1
-slaying troll_canyon.8
-hp 16
-sp 14
-x 16
-y 14
-end
-arch magic_mouth
+arch sign_w
 msg
-Looks like a long way down.
+undurgrnd foood place
 endmsg
 x 16
 y 15
 end
 arch pstone_2
 x 16
-y 15
-end
-arch chole_1
-slaying troll_canyon.8
-hp 16
-sp 15
-x 16
-y 15
-end
-arch magic_mouth
-msg
-Looks like a long way down.
-endmsg
-x 16
-y 16
-end
-arch pstone_2
-x 16
-y 16
-end
-arch chole_1
-slaying troll_canyon.8
-hp 16
-sp 16
-x 16
 y 16
 end
 arch pstone_2
diff --git a/navar_city/troll_canyon/troll_canyon.5 b/navar_city/troll_canyon/troll_canyon.5
index b8d1a7b51..5d3f009e8 100755
--- a/navar_city/troll_canyon/troll_canyon.5
+++ b/navar_city/troll_canyon/troll_canyon.5
@@ -7,8 +7,9 @@ height 20
 enter_y 6
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2013-07-26 Kevin Zheng
 endmsg
+tile_path_1 troll_canyon.9
 tile_path_3 troll_canyon.6
 tile_path_4 troll_canyon.4
 end
diff --git a/navar_city/troll_canyon/troll_canyon.7 b/navar_city/troll_canyon/troll_canyon.7
index 812f15e33..0aceef013 100755
--- a/navar_city/troll_canyon/troll_canyon.7
+++ b/navar_city/troll_canyon/troll_canyon.7
@@ -8,9 +8,9 @@ enter_x 19
 enter_y 2
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2012-04-22 Nicolas Weeger
+Modified: 2013-07-26 Kevin Zheng
 endmsg
-tile_path_1 troll_canyon.8
+tile_path_1 troll_canyon.4
 tile_path_2 troll_canyon.6
 end
 arch cave_15
@@ -386,7 +386,7 @@ end
 arch pstone_2
 x 4
 end
-arch cave13
+arch cave4
 x 4
 end
 arch pstone_2
@@ -492,6 +492,9 @@ end
 arch pstone_2
 x 5
 end
+arch cave4
+x 5
+end
 arch pstone_1
 x 5
 y 1
@@ -587,10 +590,20 @@ end
 arch pstone_2
 x 6
 end
+arch cave4
+x 6
+end
 arch pstone_1
 x 6
 y 1
 end
+arch stair_down_3
+slaying basement
+hp 6
+sp 16
+x 6
+y 1
+end
 arch pstone_2
 x 6
 y 2
@@ -682,10 +695,20 @@ end
 arch pstone_2
 x 7
 end
+arch cave4
+x 7
+end
 arch pstone_2
 x 7
 y 1
 end
+arch stair_down_3
+slaying basement
+hp 7
+sp 16
+x 7
+y 1
+end
 arch pstone_2
 x 7
 y 2
@@ -785,6 +808,9 @@ end
 arch pstone_2
 x 8
 end
+arch cave4
+x 8
+end
 arch pstone_2
 x 8
 y 1
@@ -888,7 +914,7 @@ end
 arch pstone_2
 x 9
 end
-arch cave1
+arch cave25
 x 9
 end
 arch pstone_2
@@ -1684,7 +1710,11 @@ arch cave_15
 x 16
 y 13
 end
-arch cave25
+arch shallow_sea
+x 16
+y 14
+end
+arch cave_21
 x 16
 y 14
 end
@@ -1692,10 +1722,6 @@ arch shallow_sea
 x 16
 y 15
 end
-arch cave5
-x 16
-y 15
-end
 arch shallow_sea
 x 16
 y 16
@@ -1779,7 +1805,11 @@ arch cave_15
 x 17
 y 13
 end
-arch cave_15
+arch shallow_sea
+x 17
+y 14
+end
+arch cave25
 x 17
 y 14
 end
@@ -1787,7 +1817,7 @@ arch shallow_sea
 x 17
 y 15
 end
-arch cave4
+arch cave1
 x 17
 y 15
 end
@@ -1795,7 +1825,7 @@ arch shallow_sea
 x 17
 y 16
 end
-arch cave2
+arch cave22
 x 17
 y 16
 end
@@ -1877,19 +1907,11 @@ arch cave_15
 x 18
 y 14
 end
-arch shallow_sea
+arch cave_15
 x 18
 y 15
 end
-arch cave4
-x 18
-y 15
-end
-arch shallow_sea
-x 18
-y 16
-end
-arch cave2
+arch cave_15
 x 18
 y 16
 end
@@ -1971,19 +1993,11 @@ arch cave_15
 x 19
 y 14
 end
-arch shallow_sea
+arch cave_15
 x 19
 y 15
 end
-arch cave4
-x 19
-y 15
-end
-arch shallow_sea
-x 19
-y 16
-end
-arch cave2
+arch cave_15
 x 19
 y 16
 end
diff --git a/navar_city/troll_canyon/troll_canyon.9 b/navar_city/troll_canyon/troll_canyon.9
index 28c18d01f..ce19102cf 100755
--- a/navar_city/troll_canyon/troll_canyon.9
+++ b/navar_city/troll_canyon/troll_canyon.9
@@ -7,10 +7,11 @@ height 20
 enter_y 10
 msg
 Created:  2007-02-03 Brad Reilly
-Modified: 2011-11-21 Rick Tanner
+Modified: 2013-07-26 Kevin Zheng
 endmsg
 tile_path_1 troll_canyon.12
 tile_path_2 troll_canyon.10
+tile_path_3 troll_canyon.5
 tile_path_4 troll_canyon.3
 end
 arch cave_15