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

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

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

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

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

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

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

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