--- deliantra/maps/navar_city/misc/city1magic.map	2006/06/11 08:00:42	1.3
+++ deliantra/maps/navar_city/misc/city1magic.map	2006/07/18 11:39:19	1.4
@@ -9,7 +9,7 @@
 shopmin 40
 shopmax 500000
 shoprace human
-width 21
+width 24
 height 16
 enter_x 1
 enter_y 1
@@ -202,6 +202,10 @@
 x 1
 y 9
 end
+arch shop_special
+x 1
+y 9
+end
 arch shop_potions
 x 1
 y 10
@@ -337,6 +341,10 @@
 x 2
 y 9
 end
+arch shop_potions
+x 2
+y 9
+end
 arch shop_armour
 x 2
 y 10
@@ -445,6 +453,10 @@
 x 3
 y 9
 end
+arch shop_potions
+x 3
+y 9
+end
 arch shop_armour
 x 3
 y 10
@@ -647,7 +659,7 @@
 arch westcwall_2_1_2
 x 6
 end
-arch shop_ring
+arch shop_empty
 x 6
 y 1
 end
@@ -655,7 +667,7 @@
 x 6
 y 2
 end
-arch shop_food
+arch shop_empty
 x 6
 y 3
 end
@@ -1495,43 +1507,43 @@
 x 18
 y 2
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 3
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 4
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 5
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 6
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 7
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 8
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 9
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 10
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 11
 end
-arch shop_empty
+arch shop_scrolls
 x 18
 y 12
 end
@@ -1561,7 +1573,7 @@
 x 19
 y 1
 end
-arch shop_scrolls
+arch shop_empty
 x 19
 y 2
 end
@@ -1605,7 +1617,7 @@
 x 19
 y 12
 end
-arch shop_scrolls
+arch shop_empty
 x 19
 y 13
 end
@@ -1624,126 +1636,376 @@
 arch shop_empty
 x 20
 end
-arch westcwall_2_2_3
+arch westcwall_2_1_2
+x 20
+end
+arch shop_ring
+x 20
+y 1
+end
+arch shop_empty
+x 20
+y 2
+end
+arch shop_empty
+x 20
+y 3
+end
+arch shop_empty
+x 20
+y 4
+end
+arch shop_empty
+x 20
+y 5
+end
+arch shop_empty
+x 20
+y 6
+end
+arch shop_empty
+x 20
+y 7
+end
+arch shop_empty
+x 20
+y 8
+end
+arch shop_empty
+x 20
+y 9
+end
+arch shop_empty
+x 20
+y 10
+end
+arch shop_empty
 x 20
+y 11
+end
+arch shop_empty
+x 20
+y 12
 end
 arch shop_empty
 x 20
+y 13
+end
+arch shop_wands
+x 20
+y 14
+end
+arch shop_empty
+x 20
+y 15
+end
+arch westcwall_2_1_2
+x 20
+y 15
+end
+arch shop_empty
+x 21
+end
+arch westcwall_2_1_2
+x 21
+end
+arch shop_ring
+x 21
+y 1
+end
+arch shop_empty
+x 21
+y 2
+end
+arch shop_empty
+x 21
+y 3
+end
+arch shop_ring
+x 21
+y 3
+end
+arch shop_empty
+x 21
+y 4
+end
+arch shop_ring
+x 21
+y 4
+end
+arch shop_empty
+x 21
+y 5
+end
+arch shop_ring
+x 21
+y 5
+end
+arch shop_empty
+x 21
+y 6
+end
+arch shop_ring
+x 21
+y 6
+end
+arch shop_empty
+x 21
+y 7
+end
+arch shop_ring
+x 21
+y 7
+end
+arch shop_empty
+x 21
+y 8
+end
+arch shop_ring
+x 21
+y 8
+end
+arch shop_empty
+x 21
+y 9
+end
+arch shop_ring
+x 21
+y 9
+end
+arch shop_empty
+x 21
+y 10
+end
+arch shop_ring
+x 21
+y 10
+end
+arch shop_empty
+x 21
+y 11
+end
+arch shop_ring
+x 21
+y 11
+end
+arch shop_empty
+x 21
+y 12
+end
+arch shop_ring
+x 21
+y 12
+end
+arch shop_empty
+x 21
+y 13
+end
+arch shop_wands
+x 21
+y 14
+end
+arch shop_empty
+x 21
+y 15
+end
+arch westcwall_2_1_2
+x 21
+y 15
+end
+arch shop_empty
+x 22
+end
+arch westcwall_2_1_2
+x 22
+end
+arch shop_ring
+x 22
+y 1
+end
+arch shop_empty
+x 22
+y 2
+end
+arch shop_ring
+x 22
+y 3
+end
+arch shop_ring
+x 22
+y 4
+end
+arch shop_ring
+x 22
+y 5
+end
+arch shop_ring
+x 22
+y 6
+end
+arch shop_ring
+x 22
+y 7
+end
+arch shop_ring
+x 22
+y 8
+end
+arch shop_ring
+x 22
+y 9
+end
+arch shop_ring
+x 22
+y 10
+end
+arch shop_ring
+x 22
+y 11
+end
+arch shop_ring
+x 22
+y 12
+end
+arch shop_empty
+x 22
+y 13
+end
+arch shop_wands
+x 22
+y 14
+end
+arch shop_empty
+x 22
+y 15
+end
+arch westcwall_2_1_2
+x 22
+y 15
+end
+arch shop_empty
+x 23
+end
+arch westcwall_2_2_3
+x 23
+end
+arch shop_empty
+x 23
 y 1
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 1
 end
 arch shop_empty
-x 20
+x 23
 y 2
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 2
 end
 arch shop_empty
-x 20
+x 23
 y 3
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 3
 end
 arch shop_empty
-x 20
+x 23
 y 4
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 4
 end
 arch shop_empty
-x 20
+x 23
 y 5
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 5
 end
 arch shop_empty
-x 20
+x 23
 y 6
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 6
 end
 arch shop_empty
-x 20
+x 23
 y 7
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 7
 end
 arch shop_empty
-x 20
+x 23
 y 8
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 8
 end
 arch shop_empty
-x 20
+x 23
 y 9
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 9
 end
 arch shop_empty
-x 20
+x 23
 y 10
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 10
 end
 arch shop_empty
-x 20
+x 23
 y 11
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 11
 end
 arch shop_empty
-x 20
+x 23
 y 12
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 12
 end
 arch shop_empty
-x 20
+x 23
 y 13
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 13
 end
 arch shop_empty
-x 20
+x 23
 y 14
 end
 arch westcwall_2_1_1
-x 20
+x 23
 y 14
 end
 arch shop_empty
-x 20
+x 23
 y 15
 end
 arch westcwall_2_2_4
-x 20
+x 23
 y 15
 end