--- deliantra/maps/navar_city/city1enter.map	2006/04/27 18:35:49	1.2
+++ deliantra/maps/navar_city/city1enter.map	2007/08/04 13:04:17	1.8
@@ -1,5 +1,5 @@
 arch map
-region navar
+file_format_version 1
 name city1enter
 reset_timeout 7200
 difficulty 7
@@ -914,6 +914,19 @@
 y 8
 end
 arch medium_guard
+msg
+@match yes
+@trigger 10 1
+Please enter and talk to the next guard about
+any contraband you may have.
+@match no
+@trigger 10 0
+Oh, sorry to hear that. Well, see you again
+anytime!
+@match *
+Hello there! Welcome to Navar!
+Would you like to enter?
+endmsg
 x 11
 y 8
 end
@@ -929,26 +942,6 @@
 x 11
 y 10
 end
-arch magic_ear
-msg
-@match yes|Yes
-Please enter, and talk to the next
-guard
-Click
-endmsg
-x 11
-y 10
-connected 10
-end
-arch magic_ear
-msg
-@match hello|Hello|hi|Hi
-Yes, hello there, would you like to
-enter
-endmsg
-x 11
-y 10
-end
 arch dungeon_floor
 x 11
 y 11
@@ -1082,6 +1075,20 @@
 y 2
 end
 arch guard
+msg
+@match open
+@trigger 30 1
+@addtopic close
+Ok, here you are, have a nice trip and
+please visit us again anytime!
+@match close
+@trigger 30 0
+Heh,  thanks for reminiding me. See you!
+@match *
+@addtopic open
+Well hello, I hope you had a nice
+visit to our city! Shall I open the gate?
+endmsg
 x 13
 y 2
 end
@@ -1136,7 +1143,7 @@
 arch door_look_1
 x 13
 y 9
-no_pass 0
+move_block -all
 blocksview 1
 end
 arch dungeon_floor
@@ -1169,17 +1176,6 @@
 x 14
 y 2
 end
-arch magic_ear
-msg
-@match *
-Well hello, I hope you had a nice
-visit to our city, please come again
-Click.
-endmsg
-x 14
-y 2
-connected 30
-end
 arch dungeon_floor
 x 14
 y 3
@@ -1311,6 +1307,26 @@
 y 8
 end
 arch medium_guard
+msg
+@match contraband
+Anything that we do not want in our
+city, Necromantic Spells, creatures of
+the dead, creatures of foul nature,
+and such
+@match no
+@trigger 20 1
+Then please enter our city and enjoy
+your stay
+@match yes
+@trigger 20 0
+Ok, if you have contraband you can't enter.
+@match *
+@addtopic no
+If you want to go in the city you will
+have to drop all your contraband
+inside the doorway...do you have any
+contraband?
+endmsg
 x 15
 y 8
 end
@@ -1326,33 +1342,6 @@
 x 15
 y 10
 end
-arch magic_ear
-msg
-@match no|No
-Then please enter our city and enjoy
-your stay
-Click.
-endmsg
-x 15
-y 10
-connected 20
-end
-arch magic_ear
-msg
-@match hi|Hi|hello|Hello
-If you want to go in the city you will
-have to drop all your contraband
-inside the doorway...do you have any
-contraband?
-@match contraband|Contraband
-Anything that we do not want in our
-city, Necromantic Spells, creatures of
-the dead, creatures of foul nature,
-and such
-endmsg
-x 15
-y 10
-end
 arch dungeon_floor
 x 15
 y 11