From 47dab89e0057721ccd5361ed03b8f502ba1fc7bd Mon Sep 17 00:00:00 2001
From: temitchell <temitchell@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 14 Jun 2004 00:57:04 +0000
Subject: [PATCH] - apply same type of fix to Navar as was applied to gatehouse
 in Scorn to prevent spells propagating into the city (add a wall basically)

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2837 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 navar_city/city1enter       | 66 ++++++++++++++++++-------------------
 navar_city/illusion/illexit | 12 +++++--
 world/world_121_116         | 35 ++++++++------------
 3 files changed, 56 insertions(+), 57 deletions(-)

diff --git a/navar_city/city1enter b/navar_city/city1enter
index 4fee0b968..abf435bf3 100644
--- a/navar_city/city1enter
+++ b/navar_city/city1enter
@@ -1,16 +1,16 @@
 arch map
 name city1enter
-reset_timeout 7200
-difficulty 7
+msg
+Creator:
+Email:
+Date: Thu Oct 28 14:50:05 1993
+endmsg
 width 20
 height 13
 enter_x 1
 enter_y 1
-msg
-Creator: 
-Email: 
-Date: Thu Oct 28 14:50:05 1993
-endmsg
+reset_timeout 7200
+difficulty 7
 end
 arch dungeon_floor
 end
@@ -579,20 +579,20 @@ x 7
 y 4
 end
 arch spikes_closed
-x 7
-y 4
 speed 0.500000
 connected 200
+x 7
+y 4
 end
 arch dungeon_floor
 x 7
 y 5
 end
 arch spikes_closed
-x 7
-y 5
 speed 0.500000
 connected 200
+x 7
+y 5
 end
 arch dungeon_floor
 x 7
@@ -607,20 +607,20 @@ x 7
 y 7
 end
 arch spikes_closed
-x 7
-y 7
 speed 0.500000
 connected 100
+x 7
+y 7
 end
 arch dungeon_floor
 x 7
 y 8
 end
 arch spikes_closed
-x 7
-y 8
 speed 0.500000
 connected 100
+x 7
+y 8
 end
 arch dungeon_floor
 x 7
@@ -735,9 +735,9 @@ x 9
 y 5
 end
 arch button_handle
+connected 200
 x 9
 y 5
-connected 200
 end
 arch guard
 x 9
@@ -756,9 +756,9 @@ x 9
 y 7
 end
 arch button_handle
+connected 100
 x 9
 y 7
-connected 100
 end
 arch guard
 x 9
@@ -935,9 +935,9 @@ Please enter, and talk to the next
 guard
 Click
 endmsg
+connected 10
 x 11
 y 10
-connected 10
 end
 arch magic_ear
 msg
@@ -971,10 +971,10 @@ x 12
 y 1
 end
 arch grate_closed_2
-x 12
-y 1
 speed 0.500000
 connected 30
+x 12
+y 1
 end
 arch dungeon_floor
 x 12
@@ -1053,10 +1053,10 @@ x 12
 y 11
 end
 arch grate_closed_2
-x 12
-y 11
 speed 0.500000
 connected 10
+x 12
+y 11
 end
 arch dungeon_floor
 x 12
@@ -1114,13 +1114,13 @@ y 7
 end
 arch book_read
 name Strange Book
-name_pl Strange Book
 msg
 The Art of ...r....c.
 by the High Wizard of Navar, Morkov
 Hmmm, some of the title seems to be
 scratched out.
 endmsg
+name_pl Strange Book
 x 13
 y 7
 end
@@ -1133,10 +1133,10 @@ x 13
 y 9
 end
 arch door_look_1
-x 13
-y 9
 no_pass 0
 blocksview 1
+x 13
+y 9
 end
 arch dungeon_floor
 x 13
@@ -1175,9 +1175,9 @@ Well hello, I hope you had a nice
 visit to our city, please come again
 Click.
 endmsg
+connected 30
 x 14
 y 2
-connected 30
 end
 arch dungeon_floor
 x 14
@@ -1332,9 +1332,9 @@ Then please enter out city and enjoy
 your stay
 Click.
 endmsg
+connected 20
 x 15
 y 10
-connected 20
 end
 arch magic_ear
 msg
@@ -1447,10 +1447,10 @@ x 16
 y 11
 end
 arch grate_closed_2
-x 16
-y 11
 speed 0.500000
 connected 20
+x 16
+y 11
 end
 arch dungeon_floor
 x 16
@@ -1624,7 +1624,7 @@ y 3
 end
 arch invis_exit
 slaying /world/world_121_116
-hp 37
+hp 38
 sp 46
 x 19
 y 4
@@ -1635,7 +1635,7 @@ y 4
 end
 arch invis_exit
 slaying /world/world_121_116
-hp 37
+hp 38
 sp 46
 x 19
 y 5
@@ -1654,7 +1654,7 @@ y 6
 end
 arch invis_exit
 slaying /world/world_121_116
-hp 37
+hp 38
 sp 46
 x 19
 y 7
@@ -1665,7 +1665,7 @@ y 7
 end
 arch invis_exit
 slaying /world/world_121_116
-hp 37
+hp 38
 sp 46
 x 19
 y 8
diff --git a/navar_city/illusion/illexit b/navar_city/illusion/illexit
index b9e56ab91..64f769198 100644
--- a/navar_city/illusion/illexit
+++ b/navar_city/illusion/illexit
@@ -554,7 +554,9 @@ arch cwall_3_3
 x 4
 y 6
 end
-arch cobblestones2
+arch guard_house_1
+type 0
+is_floor 1
 x 4
 y 7
 end
@@ -664,7 +666,7 @@ arch cobblestones2
 x 5
 y 6
 end
-arch cwall_2_1_2
+arch cwall_3_3
 x 5
 y 6
 end
@@ -672,11 +674,15 @@ arch cobblestones2
 x 5
 y 7
 end
+arch guard_house_2
+x 5
+y 7
+end
 arch cobblestones2
 x 5
 y 8
 end
-arch cwall_2_1_2
+arch cwall_3_1
 x 5
 y 8
 end
diff --git a/world/world_121_116 b/world/world_121_116
index 17a675e3d..8c7706a62 100644
--- a/world/world_121_116
+++ b/world/world_121_116
@@ -8897,17 +8897,13 @@ arch cobblestones2
 x 35
 y 46
 end
-arch invis_exit
+arch guard_house_1
 slaying /navar_city/city1enter
 hp 1
 sp 8
 x 35
 y 46
 end
-arch guard_house_1
-x 35
-y 46
-end
 arch cobblestones2
 x 35
 y 47
@@ -9193,24 +9189,14 @@ arch cwall_3_3
 x 36
 y 45
 end
-arch dungeon_magic
-x 36
-y 46
-end
-arch cobblestones2
-x 36
-y 46
-end
-arch invis_exit
-slaying /navar_city/city1enter
-hp 18
-sp 4
+arch guard_house_1
+type 0
+no_pass 1
+is_floor 1
 x 36
 y 46
 end
 arch guard_house_2
-walk_on 0
-fly_on 0
 x 36
 y 46
 end
@@ -9498,7 +9484,7 @@ arch cobblestones2
 x 37
 y 45
 end
-arch cwall_2_1_2
+arch cwall_3_3
 x 37
 y 45
 end
@@ -9510,6 +9496,13 @@ arch cobblestones2
 x 37
 y 46
 end
+arch guard_house_2
+slaying /navar_city/city1enter
+hp 18
+sp 4
+x 37
+y 46
+end
 arch dungeon_magic
 x 37
 y 47
@@ -9518,7 +9511,7 @@ arch cobblestones2
 x 37
 y 47
 end
-arch cwall_2_1_2
+arch cwall_3_1
 x 37
 y 47
 end