From 743d4d413ba0be9975b0b5f3197a2f4dda374adf Mon Sep 17 00:00:00 2001
From: temitchell <temitchell@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 14 Sep 2003 00:06:59 +0000
Subject: [PATCH] - I've long wanted to fix up the entry to this shop -
 Hopefully there will be less bumping and more room now.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2321 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/magicshop | 322 +++++++++++++++++++++++++++++++++---------
 1 file changed, 258 insertions(+), 64 deletions(-)

diff --git a/scorn/shops/magicshop b/scorn/shops/magicshop
index da9ace456..aea1f9e25 100644
--- a/scorn/shops/magicshop
+++ b/scorn/shops/magicshop
@@ -1,13 +1,15 @@
 arch map
 name magicshop
 msg
-Creator: 
-Email: 
+Creator:
+Email:
 Date: Fri Oct 15 13:54:01 1993
 endmsg
-hp 14
-sp 14
-stand_still 1
+width 18
+height 16
+enter_x 14
+enter_y 14
+fixed_resettime 1
 end
 arch shop_empty
 end
@@ -1149,22 +1151,10 @@ arch woodfloor
 x 13
 y 13
 end
-arch altar
-name altar of detect magic (10 gp)
-slaying money
-sp 76
-food 100
-x 13
-y 13
-end
 arch woodfloor
 x 13
 y 14
 end
-arch identify_table
-x 13
-y 14
-end
 arch shop_empty
 x 13
 y 15
@@ -1243,14 +1233,6 @@ arch woodfloor
 x 14
 y 13
 end
-arch altar
-name altar of detect curse (25 gp)
-slaying money
-sp 79
-food 250
-x 14
-y 13
-end
 arch woodfloor
 x 14
 y 14
@@ -1274,14 +1256,14 @@ end
 arch shop_empty
 x 15
 end
-arch wall_2_2_3
+arch wall_3_3
 x 15
 end
 arch shop_empty
 x 15
 y 1
 end
-arch wall_2_1_1
+arch window_win1
 x 15
 y 1
 end
@@ -1289,7 +1271,7 @@ arch shop_empty
 x 15
 y 2
 end
-arch wall_2_1_1
+arch window_win1
 x 15
 y 2
 end
@@ -1297,7 +1279,7 @@ arch shop_empty
 x 15
 y 3
 end
-arch wall_2_1_1
+arch window_win1
 x 15
 y 3
 end
@@ -1305,7 +1287,7 @@ arch shop_empty
 x 15
 y 4
 end
-arch wall_2_1_1
+arch wall_2_2_1
 x 15
 y 4
 end
@@ -1313,91 +1295,303 @@ arch shop_empty
 x 15
 y 5
 end
-arch wall_2_1_1
-x 15
-y 5
-end
 arch shop_empty
 x 15
 y 6
 end
-arch wall_2_1_1
-x 15
-y 6
-end
 arch shop_empty
 x 15
 y 7
 end
-arch wall_2_1_1
-x 15
-y 7
-end
 arch shop_empty
 x 15
 y 8
 end
-arch wall_2_1_1
-x 15
-y 8
-end
 arch shop_empty
 x 15
 y 9
 end
-arch wall_2_1_1
-x 15
-y 9
-end
 arch shop_empty
 x 15
 y 10
 end
-arch wall_2_1_1
-x 15
-y 10
-end
 arch shop_empty
 x 15
 y 11
 end
-arch wall_2_1_1
+arch swall_2_1_2
 x 15
 y 11
 end
+arch woodfloor
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
+arch woodfloor
+x 15
+y 14
+end
+arch shop_empty
+x 15
+y 15
+end
+arch wall_2_1_2
+x 15
+y 15
+end
+arch shop_empty
+x 16
+end
+arch wall_2_1_2
+x 16
+end
+arch shop_empty
+x 16
+y 1
+end
+arch table_3
+x 16
+y 1
+end
+arch bones3
+x 16
+y 1
+end
+arch shop_empty
+x 16
+y 2
+end
+arch shop_empty
+x 16
+y 3
+end
+arch green_dragon2
+name Rudy Oneeye
+msg
+@match hello|hi|greetings
+Welcome to my shop.
+@match *
+Feel free to examine the merchandise
+but remember:
+You break it you bought it.
+No testing out the wands either...
+endmsg
+randomitems jail
+level 5
+x 16
+y 3
+end
+arch shop_empty
+x 16
+y 4
+end
+arch window_win2
+x 16
+y 4
+end
+arch shop_empty
+x 16
+y 5
+end
+arch shop_empty
+x 16
+y 6
+end
+arch shop_empty
+x 16
+y 7
+end
+arch shop_empty
+x 16
+y 8
+end
+arch shop_empty
+x 16
+y 9
+end
+arch shop_empty
+x 16
+y 10
+end
+arch shop_empty
+x 16
+y 11
+end
+arch swall_2_1_2
+x 16
+y 11
+end
+arch woodfloor
+x 16
+y 12
+end
+arch altar
+name altar of detect magic (10 gp)
+slaying money
+sp 76
+food 100
+x 16
+y 12
+end
+arch woodfloor
+x 16
+y 13
+end
+arch altar
+name altar of detect curse (25 gp)
+slaying money
+sp 79
+food 250
+x 16
+y 13
+end
+arch woodfloor
+x 16
+y 14
+end
+arch identify_table
+x 16
+y 14
+end
+arch shop_empty
+x 16
+y 15
+end
+arch wall_2_1_2
+x 16
+y 15
+end
+arch shop_empty
+x 17
+end
+arch wall_2_2_3
+x 17
+end
+arch shop_empty
+x 17
+y 1
+end
+arch wall_2_1_1
+x 17
+y 1
+end
+arch shop_empty
+x 17
+y 2
+end
+arch wall_2_1_1
+x 17
+y 2
+end
+arch shop_empty
+x 17
+y 3
+end
+arch wall_2_1_1
+x 17
+y 3
+end
+arch shop_empty
+x 17
+y 4
+end
+arch wall_3_4
+x 17
+y 4
+end
+arch shop_empty
+x 17
+y 5
+end
+arch wall_2_1_1
+x 17
+y 5
+end
+arch shop_empty
+x 17
+y 6
+end
+arch wall_2_1_1
+x 17
+y 6
+end
+arch shop_empty
+x 17
+y 7
+end
+arch wall_2_1_1
+x 17
+y 7
+end
+arch shop_empty
+x 17
+y 8
+end
+arch wall_2_1_1
+x 17
+y 8
+end
+arch shop_empty
+x 17
+y 9
+end
+arch wall_2_1_1
+x 17
+y 9
+end
+arch shop_empty
+x 17
+y 10
+end
+arch wall_2_1_1
+x 17
+y 10
+end
+arch shop_empty
+x 17
+y 11
+end
+arch wall_2_1_1
+x 17
+y 11
+end
 arch swall_1_3_half
-x 15
+x 17
 y 11
 end
 arch shop_empty
-x 15
+x 17
 y 12
 end
 arch wall_2_1_1
-x 15
+x 17
 y 12
 end
 arch shop_empty
-x 15
+x 17
 y 13
 end
 arch wall_2_1_1
-x 15
+x 17
 y 13
 end
 arch shop_empty
-x 15
+x 17
 y 14
 end
 arch wall_2_1_1
-x 15
+x 17
 y 14
 end
 arch shop_empty
-x 15
+x 17
 y 15
 end
 arch wall_2_2_4
-x 15
+x 17
 y 15
 end