From c15d1466aa5b2556baa9e31c3ef09ea915e68316 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Wed, 23 May 2012 07:03:55 +0000
Subject: [PATCH] Moved Marksel Shoppe map in to /marksel/shops directory. 
 Updated world map (world/world_120_109) due to file path changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18153 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 marksel/{ => shops}/shop | 10 +++++-----
 world/world_120_109      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
 rename marksel/{ => shops}/shop (98%)

diff --git a/marksel/shop b/marksel/shops/shop
similarity index 98%
rename from marksel/shop
rename to marksel/shops/shop
index 9c156974e..6d3c6ed21 100644
--- a/marksel/shop
+++ b/marksel/shops/shop
@@ -12,7 +12,7 @@ enter_x 10
 enter_y 11
 msg
 Created:  1999-01-27 King Zoobus
-Modified: 2012-02-10 Rick Tanner
+Modified: 2012-05-23 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -1057,7 +1057,7 @@ x 9
 y 14
 end
 arch invis_exit
-slaying /world/world_120_109
+slaying ../../world/world_120_109
 hp 43
 sp 45
 x 9
@@ -1170,7 +1170,7 @@ x 10
 y 14
 end
 arch invis_exit
-slaying /world/world_120_109
+slaying ../../world/world_120_109
 hp 43
 sp 45
 x 10
@@ -1252,7 +1252,7 @@ msg
 @match magic
 The sages tower next door may be willing to sell... check with them.
 @match *
-Greetings! Welcome to my shop.  I'm sorry we don't have more for sale, but this is such a remote town we have little metal for trade.  The master in the corner will identify magical items, for a small fee.  You do belive in magic, don't you? 
+Greetings! Welcome to my shop.  I'm sorry we don't have more for sale, but this is such a remote town we have little metal for trade.  The master in the corner will identify magical items, for a small fee.  You do belive in magic, don't you?
 endmsg
 x 11
 y 10
@@ -1287,7 +1287,7 @@ x 11
 y 14
 end
 arch invis_exit
-slaying /world/world_120_109
+slaying ../../world/world_120_109
 hp 43
 sp 45
 x 11
diff --git a/world/world_120_109 b/world/world_120_109
index 1b041f3b0..7c821c72a 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -4,7 +4,7 @@ region marksel
 width 50
 height 50
 msg
-Modified: 2011-11-05 Andreas Kirschbaum
+Modified: 2012-05-23 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_120_108
@@ -11347,7 +11347,7 @@ y 45
 elevation 1791
 end
 arch s_shop2
-slaying /marksel/shop
+slaying /marksel/shops/shop
 hp 10
 sp 11
 x 43