From beb62459e79255d3cda98ce8c3b2d1b62c801327 Mon Sep 17 00:00:00 2001
From: mikeeusa <mikeeusa@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 15 Dec 2005 04:59:00 +0000
Subject: [PATCH] Maps: making tower of illusion exit consistent with the world
 again

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@4141 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/illusion/illexit | 124 +++++++++++++++++++-----------------
 world/world_128_101         |   8 +--
 2 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/navar_city/illusion/illexit b/navar_city/illusion/illexit
index 04f2ef867..d34398f46 100644
--- a/navar_city/illusion/illexit
+++ b/navar_city/illusion/illexit
@@ -1,17 +1,17 @@
 arch map
-region navar
 name illexit
+reset_timeout 7200
+difficulty 4
+region navar
+width 22
+height 22
+enter_x 1
+enter_y 1
 msg
 Creator:
 Email:
 Date: Wed Nov 10 09:33:33 1993
 endmsg
-width 22
-height 22
-enter_x 1
-enter_y 1
-reset_timeout 7200
-difficulty 4
 outdoor 1
 end
 arch woodfloor
@@ -547,6 +547,10 @@ arch cobblestones2
 x 4
 y 4
 end
+arch city_tower_west
+x 4
+y 4
+end
 arch cobblestones2
 x 4
 y 5
@@ -579,6 +583,15 @@ arch cobblestones2
 x 4
 y 9
 end
+arch city_tower_west
+name Tower of Illusions
+name_pl Tower of Illusions
+slaying /world/world_121_116
+hp 36
+sp 49
+x 4
+y 9
+end
 arch cobblestones2
 x 4
 y 10
@@ -591,6 +604,10 @@ arch grass
 x 4
 y 12
 end
+arch barrack_long
+x 4
+y 12
+end
 arch grass
 x 4
 y 13
@@ -607,6 +624,12 @@ arch fog
 x 4
 y 14
 end
+arch wizard_tower
+name very tall tower
+name_pl very tall tower
+x 4
+y 14
+end
 arch dungeon_magic
 x 4
 y 15
@@ -629,6 +652,7 @@ y 16
 end
 arch house_small
 name Zealot's House
+name_pl Zealot's House
 x 4
 y 16
 end
@@ -774,6 +798,7 @@ y 15
 end
 arch tavern
 name Western Navar Tavern
+name_pl Western Navar Tavern
 x 5
 y 15
 end
@@ -791,6 +816,7 @@ y 16
 end
 arch house_2
 name Run down house
+name_pl Run down house
 x 5
 y 16
 end
@@ -914,6 +940,7 @@ y 15
 end
 arch s_shop2
 name adobe house
+name_pl adobe house
 x 6
 y 15
 end
@@ -931,6 +958,7 @@ y 16
 end
 arch small_temple2
 name private house
+name_pl private house
 x 6
 y 16
 end
@@ -1012,6 +1040,10 @@ arch grass
 x 7
 y 11
 end
+arch house_up
+x 7
+y 11
+end
 arch grass
 x 7
 y 12
@@ -1020,6 +1052,10 @@ arch grass
 x 7
 y 13
 end
+arch house_long
+x 7
+y 13
+end
 arch cobblestones2
 x 7
 y 14
@@ -1098,6 +1134,12 @@ arch grass
 x 8
 y 6
 end
+arch house_long
+hp 7
+sp 19
+x 8
+y 6
+end
 arch cobblestones2
 x 8
 y 7
@@ -1218,11 +1260,9 @@ arch grass
 x 9
 y 5
 end
-arch barrack_small
+arch s_shop2
 name small house
 name_pl small house
-hp 3
-sp 19
 x 9
 y 5
 end
@@ -1242,6 +1282,12 @@ arch grass
 x 9
 y 8
 end
+arch house_long
+hp 28
+sp 22
+x 9
+y 8
+end
 arch grass
 x 9
 y 9
@@ -1384,6 +1430,10 @@ arch grass
 x 10
 y 15
 end
+arch temple1
+x 10
+y 15
+end
 arch grass
 x 10
 y 16
@@ -1878,6 +1928,10 @@ arch grass
 x 14
 y 15
 end
+arch house_up
+x 14
+y 15
+end
 arch grass
 x 14
 y 16
@@ -2740,53 +2794,3 @@ arch wwall_2_2_4
 x 21
 y 21
 end
-arch city_tower_west
-x 4
-y 4
-end
-arch city_tower_west
-name Tower of Illusions
-name_pl Tower of Illusions
-slaying /world/world_121_116
-hp 36
-sp 49
-x 4
-y 9
-end
-arch barrack_long
-x 4
-y 12
-end
-arch wizard_tower
-name very tall tower
-x 4
-y 14
-end
-arch house_up
-x 7
-y 11
-end
-arch house_long
-x 7
-y 13
-end
-arch house_long
-hp 7
-sp 19
-x 8
-y 6
-end
-arch house_long
-hp 28
-sp 22
-x 9
-y 8
-end
-arch temple1
-x 10
-y 15
-end
-arch house_up
-x 14
-y 15
-end
diff --git a/world/world_128_101 b/world/world_128_101
index d6acfb97e..6e9b11cea 100644
--- a/world/world_128_101
+++ b/world/world_128_101
@@ -13,10 +13,10 @@ Email: gnu@foo.bar
 Date: Fri Mar 11 10:35:04 2005
 endmsg
 outdoor 1
-tile_path_1 /world/world_128_100
-tile_path_2 /world/world_129_101
-tile_path_3 /world/world_128_102
-tile_path_4 /world/world_127_101
+tile_path_1 world_128_100
+tile_path_2 world_129_101
+tile_path_3 world_128_102
+tile_path_4 world_127_101
 end
 arch farmland
 end