From e386d254b927a20e8190b6c554b82425e366f4ea Mon Sep 17 00:00:00 2001
From: partmedia <partmedia@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 21 Dec 2015 23:56:39 +0000
Subject: [PATCH] Update Scorn Alchemy Shop

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20190 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/potionshop | 142 +++++++++++++++--------------------------
 1 file changed, 50 insertions(+), 92 deletions(-)

diff --git a/scorn/shops/potionshop b/scorn/shops/potionshop
index 8bcf1a38c..43266ba2a 100644
--- a/scorn/shops/potionshop
+++ b/scorn/shops/potionshop
@@ -1,5 +1,5 @@
 arch map
-name Scorn Alchemy Shop
+name Alchemy Shop
 difficulty 3
 region scorn
 shopitems potion:20;inorganic:60;container:20;*:-60
@@ -10,7 +10,7 @@ enter_x 6
 enter_y 16
 msg
 Created:  1996-05-02 bt (thomas@astro.psu.edu)
-Modified: 2013-07-29 Kevin Zheng
+Modified: 2015-12-21 Kevin Zheng
 endmsg
 outdoor 1
 end
@@ -495,6 +495,10 @@ arch woodfloor
 x 4
 y 13
 end
+arch menu
+x 4
+y 13
+end
 arch woodfloor
 x 4
 y 14
@@ -764,6 +768,10 @@ arch shop_empty
 x 6
 y 11
 end
+arch shop_mat
+x 6
+y 11
+end
 arch shop_empty
 x 6
 y 12
@@ -776,7 +784,7 @@ arch woodfloor
 x 6
 y 13
 end
-arch menu
+arch shop_mat
 x 6
 y 13
 end
@@ -885,10 +893,6 @@ arch shop_empty
 x 7
 y 11
 end
-arch shop_mat
-x 7
-y 11
-end
 arch shop_empty
 x 7
 y 12
@@ -901,10 +905,6 @@ arch woodfloor
 x 7
 y 13
 end
-arch shop_mat
-x 7
-y 13
-end
 arch woodfloor
 x 7
 y 14
@@ -1131,10 +1131,6 @@ arch woodfloor
 x 9
 y 15
 end
-arch wall_1_4
-x 9
-y 15
-end
 arch woodfloor
 x 9
 y 16
@@ -1143,15 +1139,6 @@ arch woodfloor
 x 9
 y 17
 end
-arch diamond_converter
-name Healing Potion: 1400 pp
-slaying money
-other_arch potion_heal
-sp 1
-food 70000
-x 9
-y 17
-end
 arch woodfloor
 x 9
 y 18
@@ -1271,33 +1258,10 @@ arch woodfloor
 x 10
 y 14
 end
-arch trigger_marker
-slaying potion_shop1
-msg
-You have one day's use of these facilities.
-endmsg
-food 504
-x 10
-y 14
-speed 1.0
-connected 10
-end
-arch altar_trigger
-name Drop 200 platinum for day pass
-slaying money
-food 10000
-x 10
-y 14
-connected 10
-end
 arch woodfloor
 x 10
 y 15
 end
-arch wall_2_1_2
-x 10
-y 15
-end
 arch woodfloor
 x 10
 y 16
@@ -1396,18 +1360,10 @@ arch woodfloor
 x 11
 y 14
 end
-arch wall_2_2_2
-x 11
-y 14
-end
 arch woodfloor
 x 11
 y 15
 end
-arch wall_2_2_4
-x 11
-y 15
-end
 arch woodfloor
 x 11
 y 16
@@ -1416,15 +1372,6 @@ arch woodfloor
 x 11
 y 17
 end
-arch diamond_converter
-name Mana Potion: 1400 pp
-slaying money
-other_arch potion_magic
-sp 1
-food 70000
-x 11
-y 17
-end
 arch light4
 x 11
 y 18
@@ -1528,10 +1475,6 @@ arch woodfloor
 x 12
 y 14
 end
-arch wall_2_1_2
-x 12
-y 14
-end
 arch woodfloor
 x 12
 y 15
@@ -1627,11 +1570,11 @@ arch woodfloor
 x 13
 y 13
 end
-arch woodfloor
+arch identify_table
 x 13
-y 14
+y 13
 end
-arch wall_2_1_2
+arch woodfloor
 x 13
 y 14
 end
@@ -1643,23 +1586,15 @@ arch woodfloor
 x 13
 y 16
 end
-arch wall_1_1
-x 13
-y 16
-end
 arch woodfloor
 x 13
 y 17
 end
-arch wall_2_1_1
-x 13
-y 17
-end
 arch woodfloor
 x 13
 y 18
 end
-arch wall_3_1
+arch wall_2_1_2
 x 13
 y 18
 end
@@ -1770,11 +1705,11 @@ arch woodfloor
 x 14
 y 13
 end
-arch woodfloor
+arch jade_converter2
 x 14
-y 14
+y 13
 end
-arch wall_2_1_2
+arch woodfloor
 x 14
 y 14
 end
@@ -1876,7 +1811,7 @@ arch shop_empty
 x 15
 y 12
 end
-arch wall_2_1_2
+arch wall_3_3
 x 15
 y 12
 end
@@ -1884,11 +1819,15 @@ arch woodfloor
 x 15
 y 13
 end
+arch wall_2_1_1
+x 15
+y 13
+end
 arch woodfloor
 x 15
 y 14
 end
-arch wall_2_2_3
+arch wall_1_2
 x 15
 y 14
 end
@@ -1896,15 +1835,11 @@ arch woodfloor
 x 15
 y 15
 end
-arch window_win1
-x 15
-y 15
-end
 arch woodfloor
 x 15
 y 16
 end
-arch wall_2_1_1
+arch wall_1_1
 x 15
 y 16
 end
@@ -2003,6 +1938,25 @@ arch woodfloor
 x 16
 y 13
 end
+arch trigger_marker
+slaying potion_shop1
+msg
+You have one day's use of these facilities.
+endmsg
+food 504
+x 16
+y 13
+speed 1.0
+connected 10
+end
+arch altar_trigger
+name Drop 200 platinum for day pass
+slaying money
+food 10000
+x 16
+y 13
+connected 10
+end
 arch woodfloor
 x 16
 y 14
@@ -2106,7 +2060,7 @@ arch woodfloor
 x 17
 y 13
 end
-arch window_win1
+arch wall_2_1_1
 x 17
 y 13
 end
@@ -2114,9 +2068,11 @@ arch woodfloor
 x 17
 y 14
 end
-arch wall_2_1_1
+arch window_win1
 x 17
 y 14
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 17
@@ -2412,6 +2368,8 @@ end
 arch window_win1
 x 19
 y 16
+no_magic 1
+damned 1
 end
 arch woodfloor
 x 19