From 33bd79e008f4afceec4e72080a127b769d3299f7 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 10 May 2011 04:44:30 +0000
Subject: [PATCH] Cosmetic update to Spike's Weapons in Darcap. Expanded the
 map to include ground outside the shop walls. Floor plan matches the physical
 building shape. Door or entrance now opens when a player approaches. Some,
 but very little, shop item and decor layout changes. Map considered an
 outdoor map so darkness or time of day is visible when inside; added light
 sources. Updated world map for new map entrance destination.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@14460 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 darcap/darcap/shop_w | 2365 +++++++++++++++++++++++++++++-------------
 world/world_116_102  |    6 +-
 2 files changed, 1635 insertions(+), 736 deletions(-)

diff --git a/darcap/darcap/shop_w b/darcap/darcap/shop_w
index 41a0a5fd2..319501574 100644
--- a/darcap/darcap/shop_w
+++ b/darcap/darcap/shop_w
@@ -5,260 +5,321 @@ difficulty 10
 region darcap
 shopitems weapon:80;bow:40;*:-50
 shopmax 8000
-width 16
-height 16
+width 21
+height 20
 enter_x 14
 enter_y 14
 msg
 Created:  1994-10-11
-Modified: 2010-05-30 Nicolas Weeger
+Modified: 2011-05-09 Rick Tanner
 endmsg
+outdoor 1
 end
-arch shop_empty
+arch grass_only
+end
+arch grass_only
+y 1
+end
+arch grass_only
+y 2
+end
+arch grass_only
+y 3
+end
+arch grass_only
+y 4
+end
+arch grass_only
+y 5
+end
+arch grass_only
+y 6
+end
+arch grass_only
+y 7
+end
+arch grass_only
+y 8
+end
+arch grass_only
+y 9
+end
+arch grass_only
+y 10
+end
+arch grass_only
+y 11
+end
+arch grass_only
+y 12
+end
+arch grass_only
+y 13
+end
+arch grass_only
+y 14
+end
+arch grass_only
+y 15
+end
+arch grass_only
+y 16
+end
+arch grass_only
+y 17
+end
+arch grass_only
+y 18
+end
+arch grass_only
+y 19
+end
+arch grass_only
+x 1
+end
+arch grass_only
+x 1
+y 1
+end
+arch grass_only
+x 1
+y 2
+end
+arch grass_only
+x 1
+y 3
+end
+arch grass_only
+x 1
+y 4
+end
+arch grass_only
+x 1
+y 5
+end
+arch grass_only
+x 1
+y 6
+end
+arch grass_only
+x 1
+y 7
+end
+arch grass_only
+x 1
+y 8
+end
+arch grass_only
+x 1
+y 9
+end
+arch grass_only
+x 1
+y 10
+end
+arch grass_only
+x 1
+y 11
+end
+arch grass_only
+x 1
+y 12
+end
+arch grass_only
+x 1
+y 13
+end
+arch grass_only
+x 1
+y 14
+end
+arch grass_only
+x 1
+y 15
+end
+arch grass_only
+x 1
+y 16
+end
+arch grass_only
+x 1
+y 17
+end
+arch grass_only
+x 1
+y 18
+end
+arch grass_only
+x 1
+y 19
+end
+arch cobblestones2
+x 2
+end
+arch cobblestones2
+x 2
+y 1
+end
+arch flagstone
+x 2
+y 2
 end
 arch wall_2_2_2
-end
-arch shop_empty
-y 1
-end
-arch wall_2_1_1
-y 1
-end
-arch shop_empty
+x 2
 y 2
 end
-arch wall_2_1_1
-y 2
-end
-arch shop_empty
+arch flagstone
+x 2
 y 3
 end
 arch wall_2_1_1
+x 2
 y 3
 end
-arch shop_empty
+arch flagstone
+x 2
 y 4
 end
 arch wall_2_1_1
+x 2
 y 4
 end
-arch shop_empty
+arch light2
+x 2
 y 5
 end
-arch wall_2_1_1
+arch flagstone
+x 2
 y 5
 end
-arch shop_empty
+arch window_win1
+x 2
+y 5
+end
+arch flagstone
+x 2
 y 6
 end
 arch wall_2_1_1
+x 2
 y 6
 end
-arch shop_empty
+arch flagstone
+x 2
 y 7
 end
 arch wall_2_1_1
+x 2
 y 7
 end
-arch shop_empty
+arch flagstone
+x 2
 y 8
 end
 arch wall_2_1_1
+x 2
 y 8
 end
-arch shop_empty
+arch flagstone
+x 2
 y 9
 end
 arch wall_2_1_1
+x 2
 y 9
 end
-arch shop_empty
+arch light2
+x 2
 y 10
 end
-arch wall_2_1_1
+arch flagstone
+x 2
 y 10
 end
-arch shop_empty
+arch window_win1
+x 2
+y 10
+end
+arch flagstone
+x 2
 y 11
 end
 arch wall_2_1_1
+x 2
 y 11
 end
-arch shop_empty
+arch flagstone
+x 2
 y 12
 end
 arch wall_2_1_1
+x 2
 y 12
 end
-arch shop_empty
+arch flagstone
+x 2
 y 13
 end
 arch wall_2_1_1
+x 2
 y 13
 end
-arch shop_empty
+arch light2
+x 2
 y 14
 end
-arch wall_2_1_1
+arch flagstone
+x 2
 y 14
 end
-arch shop_empty
+arch window_win1
+x 2
+y 14
+end
+arch flagstone
+x 2
 y 15
 end
+arch wall_2_1_1
+x 2
+y 15
+end
+arch flagstone
+x 2
+y 16
+end
+arch wall_2_1_1
+x 2
+y 16
+end
+arch flagstone
+x 2
+y 17
+end
 arch wall_2_2_1
-y 15
+x 2
+y 17
 end
-arch shop_empty
-x 1
+arch cobblestones2
+x 2
+y 18
 end
-arch wall_2_1_2
-x 1
+arch cobblestones2
+x 2
+y 19
 end
-arch shop_weapon
-x 1
+arch cobblestones2
+x 3
+end
+arch cobblestones2
+x 3
 y 1
 end
-arch shop_weapon
-x 1
+arch flagstone
+x 3
 y 2
 end
-arch shop_weapon
-x 1
-y 3
-end
-arch shop_weapon
-x 1
-y 4
-end
-arch shop_weapon
-x 1
-y 5
-end
-arch shop_weapon
-x 1
-y 6
-end
-arch shop_weapon
-x 1
-y 7
-end
-arch shop_weapon
-x 1
-y 8
-end
-arch shop_weapon
-x 1
-y 9
-end
-arch shop_weapon
-x 1
-y 10
-end
-arch shop_weapon
-x 1
-y 11
-end
-arch shop_weapon
-x 1
-y 12
-end
-arch shop_weapon
-x 1
-y 13
-end
-arch shop_weapon
-x 1
-y 14
-end
-arch shop_empty
-x 1
-y 15
-end
 arch wall_2_1_2
-x 1
-y 15
-end
-arch shop_empty
-x 2
-end
-arch wall_2_1_2
-x 2
-end
-arch shop_weapon
-x 2
-y 1
-end
-arch shop_weapon
-x 2
-y 2
-end
-arch shop_weapon
-x 2
-y 3
-end
-arch shop_weapon
-x 2
-y 4
-end
-arch shop_weapon
-x 2
-y 5
-end
-arch shop_weapon
-x 2
-y 6
-end
-arch shop_weapon
-x 2
-y 7
-end
-arch shop_weapon
-x 2
-y 8
-end
-arch shop_weapon
-x 2
-y 9
-end
-arch shop_weapon
-x 2
-y 10
-end
-arch shop_weapon
-x 2
-y 11
-end
-arch shop_weapon
-x 2
-y 12
-end
-arch shop_weapon
-x 2
-y 13
-end
-arch shop_weapon
-x 2
-y 14
-end
-arch shop_empty
-x 2
-y 15
-end
-arch wall_2_1_2
-x 2
-y 15
-end
-arch shop_empty
-x 3
-end
-arch wall_2_1_2
-x 3
-end
-arch shop_weapon
-x 3
-y 1
-end
-arch shop_weapon
 x 3
 y 2
 end
@@ -290,7 +351,7 @@ arch shop_weapon
 x 3
 y 9
 end
-arch shop_weapon
+arch shop_empty
 x 3
 y 10
 end
@@ -310,25 +371,42 @@ arch shop_weapon
 x 3
 y 14
 end
-arch shop_empty
+arch shop_weapon
 x 3
 y 15
 end
+arch shop_weapon
+x 3
+y 16
+end
+arch flagstone
+x 3
+y 17
+end
 arch wall_2_1_2
 x 3
-y 15
+y 17
 end
-arch shop_empty
+arch cobblestones2
+x 3
+y 18
+end
+arch cobblestones2
+x 3
+y 19
+end
+arch cobblestones2
 x 4
 end
-arch wall_2_1_2
-x 4
-end
-arch shop_weapon
+arch cobblestones2
 x 4
 y 1
 end
-arch shop_weapon
+arch flagstone
+x 4
+y 2
+end
+arch wall_2_1_2
 x 4
 y 2
 end
@@ -336,6 +414,10 @@ arch shop_weapon
 x 4
 y 3
 end
+arch light4
+x 4
+y 4
+end
 arch shop_weapon
 x 4
 y 4
@@ -348,6 +430,10 @@ arch shop_weapon
 x 4
 y 6
 end
+arch light4
+x 4
+y 7
+end
 arch shop_weapon
 x 4
 y 7
@@ -360,7 +446,11 @@ arch shop_weapon
 x 4
 y 9
 end
-arch shop_weapon
+arch light4
+x 4
+y 10
+end
+arch shop_empty
 x 4
 y 10
 end
@@ -372,6 +462,10 @@ arch shop_weapon
 x 4
 y 12
 end
+arch light4
+x 4
+y 13
+end
 arch shop_weapon
 x 4
 y 13
@@ -380,25 +474,50 @@ arch shop_weapon
 x 4
 y 14
 end
-arch shop_empty
+arch light4
 x 4
 y 15
 end
-arch wall_2_1_2
-x 4
-y 15
-end
-arch shop_empty
-x 5
-end
-arch wall_2_1_2
-x 5
-end
 arch shop_weapon
+x 4
+y 15
+end
+arch shop_weapon
+x 4
+y 16
+end
+arch flagstone
+x 4
+y 17
+end
+arch wall_2_1_2
+x 4
+y 17
+end
+arch cobblestones2
+x 4
+y 18
+end
+arch cobblestones2
+x 4
+y 19
+end
+arch cobblestones2
+x 5
+end
+arch cobblestones2
 x 5
 y 1
 end
-arch shop_weapon
+arch light2
+x 5
+y 2
+end
+arch flagstone
+x 5
+y 2
+end
+arch window_win2
 x 5
 y 2
 end
@@ -430,7 +549,7 @@ arch shop_weapon
 x 5
 y 9
 end
-arch shop_weapon
+arch shop_empty
 x 5
 y 10
 end
@@ -442,6 +561,10 @@ arch shop_weapon
 x 5
 y 12
 end
+arch light4
+x 5
+y 13
+end
 arch shop_weapon
 x 5
 y 13
@@ -450,25 +573,46 @@ arch shop_weapon
 x 5
 y 14
 end
-arch shop_empty
+arch shop_weapon
 x 5
 y 15
 end
-arch wall_2_1_2
-x 5
-y 15
-end
-arch shop_empty
-x 6
-end
-arch wall_2_1_2
-x 6
-end
 arch shop_weapon
+x 5
+y 16
+end
+arch light2
+x 5
+y 17
+end
+arch flagstone
+x 5
+y 17
+end
+arch window_win2
+x 5
+y 17
+end
+arch cobblestones2
+x 5
+y 18
+end
+arch cobblestones2
+x 5
+y 19
+end
+arch cobblestones2
+x 6
+end
+arch cobblestones2
 x 6
 y 1
 end
-arch shop_weapon
+arch flagstone
+x 6
+y 2
+end
+arch wall_2_1_2
 x 6
 y 2
 end
@@ -488,6 +632,10 @@ arch shop_weapon
 x 6
 y 6
 end
+arch light4
+x 6
+y 7
+end
 arch shop_weapon
 x 6
 y 7
@@ -500,7 +648,7 @@ arch shop_weapon
 x 6
 y 9
 end
-arch shop_weapon
+arch shop_empty
 x 6
 y 10
 end
@@ -520,25 +668,42 @@ arch shop_weapon
 x 6
 y 14
 end
-arch shop_empty
+arch shop_weapon
 x 6
 y 15
 end
-arch wall_2_1_2
-x 6
-y 15
-end
-arch shop_empty
-x 7
-end
-arch wall_2_1_2
-x 7
-end
 arch shop_weapon
+x 6
+y 16
+end
+arch flagstone
+x 6
+y 17
+end
+arch wall_2_1_2
+x 6
+y 17
+end
+arch cobblestones2
+x 6
+y 18
+end
+arch cobblestones2
+x 6
+y 19
+end
+arch cobblestones2
+x 7
+end
+arch cobblestones2
 x 7
 y 1
 end
-arch shop_weapon
+arch flagstone
+x 7
+y 2
+end
+arch wall_2_1_2
 x 7
 y 2
 end
@@ -546,6 +711,10 @@ arch shop_weapon
 x 7
 y 3
 end
+arch light4
+x 7
+y 4
+end
 arch shop_weapon
 x 7
 y 4
@@ -570,10 +739,14 @@ arch shop_weapon
 x 7
 y 9
 end
-arch shop_weapon
+arch shop_empty
 x 7
 y 10
 end
+arch light4
+x 7
+y 11
+end
 arch shop_weapon
 x 7
 y 11
@@ -590,25 +763,42 @@ arch shop_weapon
 x 7
 y 14
 end
-arch shop_empty
+arch shop_weapon
 x 7
 y 15
 end
-arch wall_2_1_2
-x 7
-y 15
-end
-arch shop_empty
-x 8
-end
-arch wall_2_1_2
-x 8
-end
 arch shop_weapon
+x 7
+y 16
+end
+arch flagstone
+x 7
+y 17
+end
+arch wall_2_1_2
+x 7
+y 17
+end
+arch cobblestones2
+x 7
+y 18
+end
+arch cobblestones2
+x 7
+y 19
+end
+arch cobblestones2
+x 8
+end
+arch cobblestones2
 x 8
 y 1
 end
-arch shop_weapon
+arch flagstone
+x 8
+y 2
+end
+arch wall_2_1_2
 x 8
 y 2
 end
@@ -636,497 +826,404 @@ arch shop_weapon
 x 8
 y 8
 end
-arch shop_weapon
+arch light4
 x 8
 y 9
 end
 arch shop_weapon
 x 8
+y 9
+end
+arch shop_empty
+x 8
 y 10
 end
-arch shop_weapon
-x 8
-y 11
-end
-arch shop_weapon
-x 8
-y 12
-end
-arch shop_weapon
-x 8
-y 13
-end
-arch shop_weapon
-x 8
-y 14
-end
-arch shop_empty
-x 8
-y 15
-end
-arch wall_2_1_2
-x 8
-y 15
-end
-arch shop_empty
-x 9
-end
-arch wall_2_1_2
-x 9
-end
-arch shop_weapon
-x 9
-y 1
-end
-arch shop_weapon
-x 9
-y 2
-end
-arch shop_weapon
-x 9
-y 3
-end
-arch shop_weapon
-x 9
-y 4
-end
-arch shop_weapon
-x 9
-y 5
-end
-arch shop_weapon
-x 9
-y 6
-end
-arch shop_weapon
-x 9
-y 7
-end
-arch shop_weapon
-x 9
-y 8
-end
-arch shop_weapon
-x 9
-y 9
-end
-arch shop_weapon
-x 9
-y 10
-end
-arch shop_weapon
-x 9
-y 11
-end
-arch shop_weapon
-x 9
-y 12
-end
-arch shop_weapon
-x 9
-y 13
-end
-arch shop_weapon
-x 9
-y 14
-end
-arch shop_empty
-x 9
-y 15
-end
-arch wall_2_1_2
-x 9
-y 15
-end
-arch shop_empty
-x 10
-end
-arch wall_2_1_2
-x 10
-end
-arch shop_weapon
-x 10
-y 1
-end
-arch shop_weapon
-x 10
-y 2
-end
-arch shop_weapon
-x 10
-y 3
-end
-arch shop_weapon
-x 10
-y 4
-end
-arch shop_weapon
-x 10
-y 5
-end
-arch shop_empty
-x 10
-y 6
-end
-arch shop_empty
-x 10
-y 7
-end
-arch shop_empty
-x 10
-y 8
-end
-arch shop_empty
-x 10
-y 9
-end
-arch shop_empty
-x 10
-y 10
-end
-arch shop_empty
-x 10
-y 11
-end
-arch shop_empty
-x 10
-y 12
-end
-arch shop_empty
-x 10
-y 13
-end
-arch shop_empty
-x 10
-y 14
-end
-arch shop_empty
-x 10
-y 15
-end
-arch wall_2_1_2
-x 10
-y 15
-end
-arch shop_empty
-x 11
-end
-arch wall_2_1_2
-x 11
-end
-arch shop_weapon
-x 11
-y 1
-end
-arch shop_weapon
-x 11
-y 2
-end
-arch shop_weapon
-x 11
-y 3
-end
-arch shop_weapon
-x 11
-y 4
-end
-arch shop_weapon
-x 11
-y 5
-end
-arch shop_empty
-x 11
-y 6
-end
-arch shop_empty
-x 11
-y 7
-end
-arch shop_empty
-x 11
-y 8
-end
-arch shop_empty
-x 11
-y 9
-end
-arch wall_2_2_2
-x 11
-y 9
-end
-arch shop_empty
-x 11
-y 10
-end
-arch wall_2_1_1
-x 11
-y 10
-end
-arch shop_empty
-x 11
-y 11
-end
-arch wall_2_1_1
-x 11
-y 11
-end
-arch shop_empty
-x 11
-y 12
-end
-arch wall_2_1_1
-x 11
-y 12
-end
-arch shop_empty
-x 11
-y 13
-end
-arch wall_2_1_1
-x 11
-y 13
-end
-arch shop_empty
-x 11
-y 14
-end
-arch wall_2_1_1
-x 11
-y 14
-end
-arch shop_empty
-x 11
-y 15
-end
-arch wall_3_1
-x 11
-y 15
-end
-arch shop_empty
-x 12
-end
-arch wall_2_1_2
-x 12
-end
-arch shop_weapon
-x 12
-y 1
-end
-arch shop_weapon
-x 12
-y 2
-end
-arch shop_weapon
-x 12
-y 3
-end
-arch shop_weapon
-x 12
-y 4
-end
-arch shop_weapon
-x 12
-y 5
-end
-arch shop_empty
-x 12
-y 6
-end
-arch shop_empty
-x 12
-y 7
-end
-arch shop_empty
-x 12
-y 8
-end
-arch shop_empty
-x 12
-y 9
-end
-arch wall_2_1_2
-x 12
-y 9
-end
 arch woodfloor
-x 12
+x 8
+y 11
+end
+arch swall_2_2_2
+x 8
+y 11
+end
+arch woodfloor
+x 8
+y 12
+end
+arch swall_2_1_1
+x 8
+y 12
+end
+arch woodfloor
+x 8
+y 13
+end
+arch swall_2_1_1
+x 8
+y 13
+end
+arch woodfloor
+x 8
+y 14
+end
+arch swall_2_1_1
+x 8
+y 14
+end
+arch woodfloor
+x 8
+y 15
+end
+arch swall_2_1_1
+x 8
+y 15
+end
+arch woodfloor
+x 8
+y 16
+end
+arch swall_2_1_1
+x 8
+y 16
+end
+arch flagstone
+x 8
+y 17
+end
+arch swall_1_2_half
+x 8
+y 17
+end
+arch wall_2_1_2
+x 8
+y 17
+end
+arch cobblestones2
+x 8
+y 18
+end
+arch cobblestones2
+x 8
+y 19
+end
+arch cobblestones2
+x 9
+end
+arch cobblestones2
+x 9
+y 1
+end
+arch flagstone
+x 9
+y 2
+end
+arch wall_2_1_2
+x 9
+y 2
+end
+arch shop_weapon
+x 9
+y 3
+end
+arch shop_weapon
+x 9
+y 4
+end
+arch shop_weapon
+x 9
+y 5
+end
+arch shop_weapon
+x 9
+y 6
+end
+arch shop_weapon
+x 9
+y 7
+end
+arch shop_weapon
+x 9
+y 8
+end
+arch shop_empty
+x 9
+y 9
+end
+arch shop_empty
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
+arch swall_2_1_2
+x 9
+y 11
+end
+arch woodfloor
+x 9
+y 12
+end
+arch woodfloor
+x 9
+y 13
+end
+arch woodfloor
+x 9
+y 14
+end
+arch woodfloor
+x 9
+y 15
+end
+arch button_small
+x 9
+y 16
+connected 1
+end
+arch woodfloor
+x 9
+y 16
+end
+arch flagstone
+x 9
+y 17
+end
+arch wall_1_3
+x 9
+y 17
+end
+arch dungeon_magic
+x 9
+y 18
+end
+arch invis_exit
+slaying /world/world_116_102
+hp 20
+sp 38
+x 9
+y 18
+end
+arch cobblestones2
+x 9
+y 18
+end
+arch cobblestones2
+x 9
+y 19
+end
+arch cobblestones2
+x 10
+end
+arch cobblestones2
+x 10
+y 1
+end
+arch light2
+x 10
+y 2
+end
+arch flagstone
+x 10
+y 2
+end
+arch window_win2
+x 10
+y 2
+end
+arch shop_empty
+x 10
+y 3
+end
+arch shop_empty
+x 10
+y 4
+end
+arch shop_empty
+x 10
+y 5
+end
+arch shop_empty
+x 10
+y 6
+end
+arch shop_empty
+x 10
+y 7
+end
+arch shop_empty
+x 10
+y 8
+end
+arch shop_empty
+x 10
+y 9
+end
+arch shop_empty
+x 10
 y 10
 end
 arch shop_mat
-x 12
+x 10
 y 10
 end
 arch woodfloor
-x 12
+x 10
+y 11
+end
+arch swall_2_1_2
+x 10
 y 11
 end
 arch woodfloor
-x 12
+x 10
 y 12
 end
-arch woodfloor
-x 12
+arch shop_mat
+x 10
+y 12
+end
+arch light4
+x 10
 y 13
 end
 arch woodfloor
-x 12
-y 14
-end
-arch woodfloor
-x 12
-y 15
-end
-arch wall_2_1_2
-x 12
-y 15
-end
-arch shop_empty
-x 13
-end
-arch wall_2_1_2
-x 13
-end
-arch shop_weapon
-x 13
-y 1
-end
-arch shop_weapon
-x 13
-y 2
-end
-arch shop_weapon
-x 13
-y 3
-end
-arch shop_weapon
-x 13
-y 4
-end
-arch shop_weapon
-x 13
-y 5
-end
-arch shop_empty
-x 13
-y 6
-end
-arch shop_empty
-x 13
-y 7
-end
-arch shop_empty
-x 13
-y 8
+x 10
+y 13
 end
 arch menu
-x 13
-y 8
-end
-arch shop_empty
-x 13
-y 9
-end
-arch wall_2_1_2
-x 13
-y 9
-end
-arch woodfloor
-x 13
-y 10
-end
-arch woodfloor
-x 13
-y 11
-end
-arch woodfloor
-x 13
-y 12
-end
-arch woodfloor
-x 13
+x 10
 y 13
 end
 arch woodfloor
-x 13
+x 10
 y 14
 end
 arch woodfloor
-x 13
+x 10
 y 15
 end
-arch wall_2_1_2
-x 13
-y 15
+arch light4
+x 10
+y 16
 end
-arch shop_empty
-x 14
+arch button_small
+x 10
+y 16
+connected 1
 end
-arch wall_2_1_2
-x 14
+arch woodfloor
+x 10
+y 16
 end
-arch shop_weapon
-x 14
+arch button_small
+x 10
+y 17
+connected 1
+end
+arch flagstone
+x 10
+y 17
+end
+arch odoorn2_closed_1
+x 10
+y 17
+connected 1
+end
+arch dungeon_magic
+x 10
+y 18
+end
+arch invis_exit
+slaying /world/world_116_102
+hp 20
+sp 38
+x 10
+y 18
+end
+arch cobblestones2
+x 10
+y 18
+end
+arch cobblestones2
+x 10
+y 19
+end
+arch cobblestones2
+x 11
+end
+arch cobblestones2
+x 11
 y 1
 end
-arch shop_weapon
-x 14
+arch flagstone
+x 11
+y 2
+end
+arch wall_2_1_2
+x 11
 y 2
 end
 arch shop_weapon
-x 14
+x 11
 y 3
 end
 arch shop_weapon
-x 14
+x 11
 y 4
 end
 arch shop_weapon
-x 14
+x 11
 y 5
 end
-arch shop_empty
-x 14
+arch shop_weapon
+x 11
 y 6
 end
-arch shop_empty
-x 14
+arch shop_weapon
+x 11
 y 7
 end
-arch shop_empty
-x 14
-y 8
-end
-arch shop_mat
-x 14
+arch shop_weapon
+x 11
 y 8
 end
 arch shop_empty
-x 14
+x 11
 y 9
 end
-arch wall_2_1_2
-x 14
-y 9
-end
-arch woodfloor
-x 14
+arch shop_empty
+x 11
 y 10
 end
 arch woodfloor
-x 14
+x 11
+y 11
+end
+arch swall_2_1_2
+x 11
 y 11
 end
 arch woodfloor
-x 14
+x 11
 y 12
 end
+arch woodfloor
+x 11
+y 13
+end
+arch woodfloor
+x 11
+y 14
+end
 arch guildmaster
 name Spike
 face paladin.151
 hp 100
 maxhp 100
-x 14
-y 12
+x 11
+y 14
 randomitems throw_stnd
 pick_up 0
 arch event_say
@@ -1143,151 +1240,953 @@ end
 end
 end
 arch woodfloor
-x 14
-y 13
-end
-arch woodfloor
-x 14
-y 14
-end
-arch woodfloor
-x 14
+x 11
 y 15
 end
-arch wall_door_1_4
-x 14
-y 15
+arch button_small
+x 11
+y 16
+connected 1
 end
-arch oakdoor_2
+arch woodfloor
+x 11
+y 16
+end
+arch flagstone
+x 11
+y 17
+end
+arch wall_1_4
+x 11
+y 17
+end
+arch dungeon_magic
+x 11
+y 18
+end
+arch invis_exit
 slaying /world/world_116_102
 hp 20
 sp 38
+x 11
+y 18
+end
+arch cobblestones2
+x 11
+y 18
+end
+arch cobblestones2
+x 11
+y 19
+end
+arch cobblestones2
+x 12
+end
+arch cobblestones2
+x 12
+y 1
+end
+arch flagstone
+x 12
+y 2
+end
+arch wall_2_1_2
+x 12
+y 2
+end
+arch shop_weapon
+x 12
+y 3
+end
+arch shop_weapon
+x 12
+y 4
+end
+arch shop_weapon
+x 12
+y 5
+end
+arch shop_weapon
+x 12
+y 6
+end
+arch shop_weapon
+x 12
+y 7
+end
+arch shop_weapon
+x 12
+y 8
+end
+arch light4
+x 12
+y 9
+end
+arch shop_weapon
+x 12
+y 9
+end
+arch shop_empty
+x 12
+y 10
+end
+arch woodfloor
+x 12
+y 11
+end
+arch swall_2_2_3
+x 12
+y 11
+end
+arch woodfloor
+x 12
+y 12
+end
+arch swall_2_1_1
+x 12
+y 12
+end
+arch woodfloor
+x 12
+y 13
+end
+arch swall_2_1_1
+x 12
+y 13
+end
+arch woodfloor
+x 12
+y 14
+end
+arch swall_2_1_1
+x 12
+y 14
+end
+arch woodfloor
+x 12
+y 15
+end
+arch swall_2_1_1
+x 12
+y 15
+end
+arch woodfloor
+x 12
+y 16
+end
+arch swall_2_1_1
+x 12
+y 16
+end
+arch flagstone
+x 12
+y 17
+end
+arch swall_1_2_half
+x 12
+y 17
+end
+arch wall_2_1_2
+x 12
+y 17
+end
+arch cobblestones2
+x 12
+y 18
+end
+arch cobblestones2
+x 12
+y 19
+end
+arch cobblestones2
+x 13
+end
+arch cobblestones2
+x 13
+y 1
+end
+arch flagstone
+x 13
+y 2
+end
+arch wall_2_1_2
+x 13
+y 2
+end
+arch shop_weapon
+x 13
+y 3
+end
+arch light4
+x 13
+y 4
+end
+arch shop_weapon
+x 13
+y 4
+end
+arch shop_weapon
+x 13
+y 5
+end
+arch shop_weapon
+x 13
+y 6
+end
+arch shop_weapon
+x 13
+y 7
+end
+arch shop_weapon
+x 13
+y 8
+end
+arch shop_weapon
+x 13
+y 9
+end
+arch shop_empty
+x 13
+y 10
+end
+arch light4
+x 13
+y 11
+end
+arch shop_weapon
+x 13
+y 11
+end
+arch shop_weapon
+x 13
+y 12
+end
+arch shop_weapon
+x 13
+y 13
+end
+arch shop_weapon
+x 13
+y 14
+end
+arch shop_weapon
+x 13
+y 15
+end
+arch shop_weapon
+x 13
+y 16
+end
+arch flagstone
+x 13
+y 17
+end
+arch wall_2_1_2
+x 13
+y 17
+end
+arch cobblestones2
+x 13
+y 18
+end
+arch cobblestones2
+x 13
+y 19
+end
+arch cobblestones2
+x 14
+end
+arch cobblestones2
+x 14
+y 1
+end
+arch flagstone
+x 14
+y 2
+end
+arch wall_2_1_2
+x 14
+y 2
+end
+arch shop_weapon
+x 14
+y 3
+end
+arch shop_weapon
+x 14
+y 4
+end
+arch shop_weapon
+x 14
+y 5
+end
+arch shop_weapon
+x 14
+y 6
+end
+arch light4
+x 14
+y 7
+end
+arch shop_weapon
+x 14
+y 7
+end
+arch shop_weapon
+x 14
+y 8
+end
+arch shop_weapon
+x 14
+y 9
+end
+arch shop_empty
+x 14
+y 10
+end
+arch shop_weapon
+x 14
+y 11
+end
+arch shop_weapon
+x 14
+y 12
+end
+arch shop_weapon
+x 14
+y 13
+end
+arch shop_weapon
+x 14
+y 14
+end
+arch shop_weapon
 x 14
 y 15
 end
+arch shop_weapon
+x 14
+y 16
+end
+arch flagstone
+x 14
+y 17
+end
+arch wall_2_1_2
+x 14
+y 17
+end
+arch cobblestones2
+x 14
+y 18
+end
+arch cobblestones2
+x 14
+y 19
+end
+arch cobblestones2
+x 15
+end
+arch cobblestones2
+x 15
+y 1
+end
+arch light2
+x 15
+y 2
+end
+arch flagstone
+x 15
+y 2
+end
+arch window_win2
+x 15
+y 2
+end
+arch shop_weapon
+x 15
+y 3
+end
+arch shop_weapon
+x 15
+y 4
+end
+arch shop_weapon
+x 15
+y 5
+end
+arch shop_weapon
+x 15
+y 6
+end
+arch shop_weapon
+x 15
+y 7
+end
+arch shop_weapon
+x 15
+y 8
+end
+arch shop_weapon
+x 15
+y 9
+end
 arch shop_empty
 x 15
+y 10
+end
+arch shop_weapon
+x 15
+y 11
+end
+arch shop_weapon
+x 15
+y 12
+end
+arch light4
+x 15
+y 13
+end
+arch shop_weapon
+x 15
+y 13
+end
+arch shop_weapon
+x 15
+y 14
+end
+arch shop_weapon
+x 15
+y 15
+end
+arch shop_weapon
+x 15
+y 16
+end
+arch light2
+x 15
+y 17
+end
+arch flagstone
+x 15
+y 17
+end
+arch window_win2
+x 15
+y 17
+end
+arch cobblestones2
+x 15
+y 18
+end
+arch cobblestones2
+x 15
+y 19
+end
+arch cobblestones2
+x 16
+end
+arch cobblestones2
+x 16
+y 1
+end
+arch flagstone
+x 16
+y 2
+end
+arch wall_2_1_2
+x 16
+y 2
+end
+arch shop_weapon
+x 16
+y 3
+end
+arch light4
+x 16
+y 4
+end
+arch shop_weapon
+x 16
+y 4
+end
+arch shop_weapon
+x 16
+y 5
+end
+arch light4
+x 16
+y 6
+end
+arch shop_weapon
+x 16
+y 6
+end
+arch shop_weapon
+x 16
+y 7
+end
+arch shop_weapon
+x 16
+y 8
+end
+arch light4
+x 16
+y 9
+end
+arch shop_weapon
+x 16
+y 9
+end
+arch shop_empty
+x 16
+y 10
+end
+arch shop_weapon
+x 16
+y 11
+end
+arch light4
+x 16
+y 12
+end
+arch shop_weapon
+x 16
+y 12
+end
+arch shop_weapon
+x 16
+y 13
+end
+arch shop_weapon
+x 16
+y 14
+end
+arch light4
+x 16
+y 15
+end
+arch shop_weapon
+x 16
+y 15
+end
+arch shop_weapon
+x 16
+y 16
+end
+arch flagstone
+x 16
+y 17
+end
+arch wall_2_1_2
+x 16
+y 17
+end
+arch cobblestones2
+x 16
+y 18
+end
+arch cobblestones2
+x 16
+y 19
+end
+arch cobblestones2
+x 17
+end
+arch cobblestones2
+x 17
+y 1
+end
+arch flagstone
+x 17
+y 2
+end
+arch wall_2_1_2
+x 17
+y 2
+end
+arch shop_weapon
+x 17
+y 3
+end
+arch shop_weapon
+x 17
+y 4
+end
+arch shop_weapon
+x 17
+y 5
+end
+arch shop_weapon
+x 17
+y 6
+end
+arch shop_weapon
+x 17
+y 7
+end
+arch shop_weapon
+x 17
+y 8
+end
+arch shop_weapon
+x 17
+y 9
+end
+arch shop_empty
+x 17
+y 10
+end
+arch shop_weapon
+x 17
+y 11
+end
+arch shop_weapon
+x 17
+y 12
+end
+arch shop_weapon
+x 17
+y 13
+end
+arch shop_weapon
+x 17
+y 14
+end
+arch shop_weapon
+x 17
+y 15
+end
+arch shop_weapon
+x 17
+y 16
+end
+arch flagstone
+x 17
+y 17
+end
+arch wall_2_1_2
+x 17
+y 17
+end
+arch cobblestones2
+x 17
+y 18
+end
+arch cobblestones2
+x 17
+y 19
+end
+arch cobblestones2
+x 18
+end
+arch cobblestones2
+x 18
+y 1
+end
+arch flagstone
+x 18
+y 2
 end
 arch wall_2_2_3
-x 15
-end
-arch shop_empty
-x 15
-y 1
-end
-arch wall_2_1_1
-x 15
-y 1
-end
-arch shop_empty
-x 15
+x 18
 y 2
 end
-arch wall_2_1_1
-x 15
-y 2
-end
-arch shop_empty
-x 15
+arch flagstone
+x 18
 y 3
 end
 arch wall_2_1_1
-x 15
+x 18
 y 3
 end
-arch shop_empty
-x 15
+arch flagstone
+x 18
 y 4
 end
 arch wall_2_1_1
-x 15
+x 18
 y 4
 end
-arch shop_empty
-x 15
+arch light2
+x 18
 y 5
 end
-arch wall_2_1_1
-x 15
+arch flagstone
+x 18
 y 5
 end
-arch shop_empty
-x 15
+arch window_win1
+x 18
+y 5
+end
+arch flagstone
+x 18
 y 6
 end
 arch wall_2_1_1
-x 15
+x 18
 y 6
 end
-arch shop_empty
-x 15
+arch flagstone
+x 18
 y 7
 end
 arch wall_2_1_1
-x 15
+x 18
 y 7
 end
-arch shop_empty
-x 15
+arch flagstone
+x 18
 y 8
 end
 arch wall_2_1_1
-x 15
+x 18
 y 8
 end
-arch shop_empty
-x 15
+arch flagstone
+x 18
 y 9
 end
-arch wall_3_4
-x 15
-y 9
-end
-arch woodfloor
-x 15
-y 10
-end
 arch wall_2_1_1
-x 15
+x 18
+y 9
+end
+arch light2
+x 18
 y 10
 end
-arch woodfloor
-x 15
+arch flagstone
+x 18
+y 10
+end
+arch window_win1
+x 18
+y 10
+end
+arch flagstone
+x 18
 y 11
 end
 arch wall_2_1_1
-x 15
+x 18
 y 11
 end
-arch woodfloor
-x 15
+arch flagstone
+x 18
 y 12
 end
 arch wall_2_1_1
-x 15
+x 18
 y 12
 end
-arch woodfloor
-x 15
+arch flagstone
+x 18
 y 13
 end
 arch wall_2_1_1
-x 15
+x 18
 y 13
 end
-arch woodfloor
-x 15
+arch light2
+x 18
 y 14
 end
-arch wall_2_1_1
-x 15
+arch flagstone
+x 18
 y 14
 end
-arch woodfloor
-x 15
+arch window_win1
+x 18
+y 14
+end
+arch flagstone
+x 18
 y 15
 end
+arch wall_2_1_1
+x 18
+y 15
+end
+arch flagstone
+x 18
+y 16
+end
+arch wall_2_1_1
+x 18
+y 16
+end
+arch flagstone
+x 18
+y 17
+end
 arch wall_2_2_4
-x 15
+x 18
+y 17
+end
+arch cobblestones2
+x 18
+y 18
+end
+arch cobblestones2
+x 18
+y 19
+end
+arch cobblestones2
+x 19
+end
+arch cobblestones2
+x 19
+y 1
+end
+arch cobblestones2
+x 19
+y 2
+end
+arch cobblestones2
+x 19
+y 3
+end
+arch cobblestones2
+x 19
+y 4
+end
+arch cobblestones2
+x 19
+y 5
+end
+arch cobblestones2
+x 19
+y 6
+end
+arch cobblestones2
+x 19
+y 7
+end
+arch cobblestones2
+x 19
+y 8
+end
+arch cobblestones2
+x 19
+y 9
+end
+arch cobblestones2
+x 19
+y 10
+end
+arch cobblestones2
+x 19
+y 11
+end
+arch cobblestones2
+x 19
+y 12
+end
+arch cobblestones2
+x 19
+y 13
+end
+arch cobblestones2
+x 19
+y 14
+end
+arch cobblestones2
+x 19
 y 15
 end
+arch cobblestones2
+x 19
+y 16
+end
+arch cobblestones2
+x 19
+y 17
+end
+arch cobblestones2
+x 19
+y 18
+end
+arch cobblestones2
+x 19
+y 19
+end
+arch cobblestones2
+x 20
+end
+arch cobblestones2
+x 20
+y 1
+end
+arch cobblestones2
+x 20
+y 2
+end
+arch cobblestones2
+x 20
+y 3
+end
+arch cobblestones2
+x 20
+y 4
+end
+arch cobblestones2
+x 20
+y 5
+end
+arch cobblestones2
+x 20
+y 6
+end
+arch cobblestones2
+x 20
+y 7
+end
+arch cobblestones2
+x 20
+y 8
+end
+arch cobblestones2
+x 20
+y 9
+end
+arch cobblestones2
+x 20
+y 10
+end
+arch cobblestones2
+x 20
+y 11
+end
+arch cobblestones2
+x 20
+y 12
+end
+arch cobblestones2
+x 20
+y 13
+end
+arch cobblestones2
+x 20
+y 14
+end
+arch cobblestones2
+x 20
+y 15
+end
+arch cobblestones2
+x 20
+y 16
+end
+arch cobblestones2
+x 20
+y 17
+end
+arch cobblestones2
+x 20
+y 18
+end
+arch cobblestones2
+x 20
+y 19
+end
diff --git a/world/world_116_102 b/world/world_116_102
index 93b56c4a1..866ee5b5d 100644
--- a/world/world_116_102
+++ b/world/world_116_102
@@ -5,7 +5,7 @@ region darcap
 width 50
 height 50
 msg
-Modified: 2011-05-08 Rick Tanner
+Modified: 2011-05-09 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_116_101
@@ -5282,8 +5282,8 @@ end
 arch store_weapons
 name Spike's Weapons
 slaying /darcap/darcap/shop_w
-hp 14
-sp 14
+hp 10
+sp 15
 x 19
 y 37
 end