From 32242b59b5e0f7ccbd0469c9feb8d6e8bb163362 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 21 Apr 2011 04:27:05 +0000
Subject: [PATCH] Numerous changes to Klondor's Wand Shop in Lake Country.
 Floor plan resembles building layout. Door or entrance now opens when a
 player approaches. Shop item 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@14422 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 lake_country/shops/klondors_wands | 3061 ++++++++++++++++++-----------
 world/world_109_126               |    6 +-
 2 files changed, 1931 insertions(+), 1136 deletions(-)

diff --git a/lake_country/shops/klondors_wands b/lake_country/shops/klondors_wands
index 9e01ae201..8ba567d20 100644
--- a/lake_country/shops/klondors_wands
+++ b/lake_country/shops/klondors_wands
@@ -5,346 +5,428 @@ region lakecountry
 shopitems gem:20;wand:100;rod:30;*:-60
 shopmin 10
 shopmax 100000
-width 16
-height 16
+width 21
+height 20
 enter_x 8
 enter_y 7
 msg
 Created:  1995-03-23
-Modified: 2008-11-28 Rick Tanner
+Modified: 2011-04-20 Rick Tanner
 endmsg
+outdoor 1
+end
+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 grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
 end
 arch shop_empty
+x 2
+y 2
 end
 arch wall_2_2_2
-end
-arch shop_empty
-y 1
-end
-arch wall_3_2
-y 1
-end
-arch shop_empty
-y 2
-end
-arch wall_2_1_1
+x 2
 y 2
 end
 arch shop_empty
+x 2
 y 3
 end
-arch wall_2_1_1
-y 3
-end
-arch shop_empty
-y 4
-end
-arch wall_2_1_1
-y 4
-end
-arch shop_empty
-y 5
-end
-arch wall_2_1_1
-y 5
-end
-arch shop_empty
-y 6
-end
-arch wall_2_1_1
-y 6
-end
-arch shop_empty
-y 7
-end
-arch wall_2_1_1
-y 7
-end
-arch shop_empty
-y 8
-end
-arch wall_2_1_1
-y 8
-end
-arch shop_empty
-y 9
-end
-arch wall_2_1_1
-y 9
-end
-arch shop_empty
-y 10
-end
-arch wall_2_1_1
-y 10
-end
-arch shop_empty
-y 11
-end
-arch wall_2_1_1
-y 11
-end
-arch shop_empty
-y 12
-end
-arch wall_2_1_1
-y 12
-end
-arch shop_empty
-y 13
-end
-arch wall_2_1_1
-y 13
-end
-arch shop_empty
-y 14
-end
 arch wall_3_2
+x 2
+y 3
+end
+arch shop_empty
+x 2
+y 4
+end
+arch wall_2_1_1
+x 2
+y 4
+end
+arch shop_empty
+x 2
+y 5
+end
+arch wall_2_1_1
+x 2
+y 5
+end
+arch shop_empty
+x 2
+y 6
+end
+arch wall_2_1_1
+x 2
+y 6
+end
+arch light2
+x 2
+y 7
+end
+arch shop_empty
+x 2
+y 7
+end
+arch window_win1
+x 2
+y 7
+end
+arch shop_empty
+x 2
+y 8
+end
+arch wall_2_1_1
+x 2
+y 8
+end
+arch shop_empty
+x 2
+y 9
+end
+arch wall_2_1_1
+x 2
+y 9
+end
+arch shop_empty
+x 2
+y 10
+end
+arch wall_2_1_1
+x 2
+y 10
+end
+arch shop_empty
+x 2
+y 11
+end
+arch wall_2_1_1
+x 2
+y 11
+end
+arch light2
+x 2
+y 12
+end
+arch shop_empty
+x 2
+y 12
+end
+arch window_win1
+x 2
+y 12
+end
+arch shop_empty
+x 2
+y 13
+end
+arch wall_2_1_1
+x 2
+y 13
+end
+arch shop_empty
+x 2
+y 14
+end
+arch wall_2_1_1
+x 2
 y 14
 end
 arch shop_empty
+x 2
 y 15
 end
+arch wall_2_1_1
+x 2
+y 15
+end
+arch shop_empty
+x 2
+y 16
+end
+arch wall_3_2
+x 2
+y 16
+end
+arch shop_empty
+x 2
+y 17
+end
 arch wall_2_2_1
-y 15
+x 2
+y 17
+end
+arch grass_only
+x 2
+y 18
+end
+arch grass_only
+x 2
+y 19
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch shop_empty
-x 1
+x 3
+y 2
 end
 arch wall_3_3
-x 1
+x 3
+y 2
 end
 arch shop_empty
-x 1
-y 1
+x 3
+y 3
 end
 arch wall_2_2_4
-x 1
-y 1
-end
-arch shop_wands
-x 1
-y 2
-end
-arch shop_wands
-x 1
+x 3
 y 3
 end
 arch shop_wands
-x 1
+x 3
 y 4
 end
 arch shop_wands
-x 1
+x 3
 y 5
 end
-arch shop_empty
-x 1
+arch shop_wands
+x 3
 y 6
 end
-arch shop_gems
-x 1
+arch shop_wands
+x 3
 y 7
 end
-arch shop_gems
-x 1
+arch light4
+x 3
 y 8
 end
-arch shop_gems
-x 1
+arch shop_wands
+x 3
+y 8
+end
+arch shop_wands
+x 3
 y 9
 end
 arch shop_gems
-x 1
+x 3
 y 10
 end
 arch shop_gems
-x 1
+x 3
 y 11
 end
 arch shop_gems
-x 1
+x 3
 y 12
 end
 arch shop_gems
-x 1
+x 3
 y 13
 end
-arch shop_empty
-x 1
+arch shop_gems
+x 3
 y 14
 end
+arch shop_gems
+x 3
+y 15
+end
+arch shop_empty
+x 3
+y 16
+end
 arch wall_2_2_3
-x 1
-y 14
+x 3
+y 16
 end
 arch shop_empty
-x 1
-y 15
+x 3
+y 17
 end
 arch wall_3_1
-x 1
-y 15
+x 3
+y 17
 end
-arch shop_empty
-x 2
+arch grass_only
+x 3
+y 18
 end
-arch wall_2_1_2
-x 2
+arch grass_only
+x 3
+y 19
 end
-arch shop_wands
-x 2
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
 y 1
 end
-arch shop_wands
-x 2
+arch shop_empty
+x 4
+y 2
+end
+arch wall_2_1_2
+x 4
 y 2
 end
 arch shop_wands
-x 2
+x 4
 y 3
 end
-arch shop_wands
-x 2
+arch light4
+x 4
 y 4
 end
 arch shop_wands
-x 2
-y 5
-end
-arch shop_empty
-x 2
-y 6
-end
-arch shop_gems
-x 2
-y 7
-end
-arch shop_gems
-x 2
-y 8
-end
-arch shop_gems
-x 2
-y 9
-end
-arch shop_gems
-x 2
-y 10
-end
-arch shop_gems
-x 2
-y 11
-end
-arch shop_gems
-x 2
-y 12
-end
-arch shop_gems
-x 2
-y 13
-end
-arch shop_gems
-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_wands
-x 3
-y 1
-end
-arch shop_wands
-x 3
-y 2
-end
-arch shop_wands
-x 3
-y 3
-end
-arch shop_wands
-x 3
-y 4
-end
-arch shop_wands
-x 3
-y 5
-end
-arch shop_empty
-x 3
-y 6
-end
-arch shop_empty
-x 3
-y 7
-end
-arch shop_empty
-x 3
-y 8
-end
-arch shop_empty
-x 3
-y 9
-end
-arch shop_empty
-x 3
-y 10
-end
-arch shop_empty
-x 3
-y 11
-end
-arch shop_gems
-x 3
-y 12
-end
-arch shop_gems
-x 3
-y 13
-end
-arch shop_gems
-x 3
-y 14
-end
-arch shop_empty
-x 3
-y 15
-end
-arch wall_2_1_2
-x 3
-y 15
-end
-arch shop_empty
-x 4
-end
-arch wall_2_1_2
-x 4
-end
-arch shop_wands
-x 4
-y 1
-end
-arch shop_wands
-x 4
-y 2
-end
-arch shop_wands
-x 4
-y 3
-end
-arch shop_wands
 x 4
 y 4
 end
@@ -352,39 +434,27 @@ arch shop_wands
 x 4
 y 5
 end
-arch shop_empty
+arch shop_wands
 x 4
 y 6
 end
-arch shop_empty
+arch shop_wands
 x 4
 y 7
 end
-arch shop_empty
+arch shop_wands
 x 4
 y 8
 end
-arch wall_1_1
-x 4
-y 8
-end
-arch shop_empty
+arch shop_wands
 x 4
 y 9
 end
-arch wall_2_1_1
-x 4
-y 9
-end
-arch shop_empty
+arch shop_gems
 x 4
 y 10
 end
-arch wall_2_2_1
-x 4
-y 10
-end
-arch shop_empty
+arch shop_gems
 x 4
 y 11
 end
@@ -400,21 +470,38 @@ arch shop_gems
 x 4
 y 14
 end
-arch shop_empty
+arch light4
 x 4
 y 15
 end
-arch wall_2_1_2
+arch shop_gems
 x 4
 y 15
 end
+arch shop_gems
+x 4
+y 16
+end
 arch shop_empty
-x 5
+x 4
+y 17
 end
 arch wall_2_1_2
+x 4
+y 17
+end
+arch grass_only
+x 4
+y 18
+end
+arch grass_only
+x 4
+y 19
+end
+arch grass_only
 x 5
 end
-arch shop_empty
+arch grass_only
 x 5
 y 1
 end
@@ -422,11 +509,15 @@ arch shop_empty
 x 5
 y 2
 end
-arch shop_empty
+arch wall_2_1_2
+x 5
+y 2
+end
+arch shop_wands
 x 5
 y 3
 end
-arch shop_empty
+arch shop_wands
 x 5
 y 4
 end
@@ -438,18 +529,749 @@ arch shop_empty
 x 5
 y 6
 end
-arch menu
-x 5
-y 6
-end
 arch shop_empty
 x 5
 y 7
 end
-arch shop_mat
+arch shop_empty
 x 5
+y 8
+end
+arch shop_empty
+x 5
+y 9
+end
+arch shop_empty
+x 5
+y 10
+end
+arch shop_empty
+x 5
+y 11
+end
+arch shop_empty
+x 5
+y 12
+end
+arch shop_empty
+x 5
+y 13
+end
+arch shop_gems
+x 5
+y 14
+end
+arch shop_gems
+x 5
+y 15
+end
+arch shop_gems
+x 5
+y 16
+end
+arch shop_empty
+x 5
+y 17
+end
+arch wall_2_1_2
+x 5
+y 17
+end
+arch grass_only
+x 5
+y 18
+end
+arch grass_only
+x 5
+y 19
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch light2
+x 6
+y 2
+end
+arch shop_empty
+x 6
+y 2
+end
+arch window_win2
+x 6
+y 2
+end
+arch shop_wands
+x 6
+y 3
+end
+arch shop_wands
+x 6
+y 4
+end
+arch light4
+x 6
+y 5
+end
+arch shop_wands
+x 6
+y 5
+end
+arch shop_wands
+x 6
+y 6
+end
+arch shop_wands
+x 6
 y 7
 end
+arch light4
+x 6
+y 8
+end
+arch shop_wands
+x 6
+y 8
+end
+arch shop_wands
+x 6
+y 9
+end
+arch shop_wands
+x 6
+y 10
+end
+arch light4
+x 6
+y 11
+end
+arch shop_wands
+x 6
+y 11
+end
+arch shop_wands
+x 6
+y 12
+end
+arch shop_empty
+x 6
+y 13
+end
+arch shop_gems
+x 6
+y 14
+end
+arch shop_gems
+x 6
+y 15
+end
+arch shop_gems
+x 6
+y 16
+end
+arch light2
+x 6
+y 17
+end
+arch shop_empty
+x 6
+y 17
+end
+arch window_win2
+x 6
+y 17
+end
+arch grass_only
+x 6
+y 18
+end
+arch grass_only
+x 6
+y 19
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch shop_empty
+x 7
+y 2
+end
+arch wall_2_1_2
+x 7
+y 2
+end
+arch shop_wands
+x 7
+y 3
+end
+arch shop_wands
+x 7
+y 4
+end
+arch shop_wands
+x 7
+y 5
+end
+arch shop_wands
+x 7
+y 6
+end
+arch shop_wands
+x 7
+y 7
+end
+arch shop_wands
+x 7
+y 8
+end
+arch shop_wands
+x 7
+y 9
+end
+arch shop_wands
+x 7
+y 10
+end
+arch shop_wands
+x 7
+y 11
+end
+arch shop_wands
+x 7
+y 12
+end
+arch shop_empty
+x 7
+y 13
+end
+arch shop_gems
+x 7
+y 14
+end
+arch shop_gems
+x 7
+y 15
+end
+arch shop_gems
+x 7
+y 16
+end
+arch shop_empty
+x 7
+y 17
+end
+arch wall_2_1_2
+x 7
+y 17
+end
+arch grass_only
+x 7
+y 18
+end
+arch grass_only
+x 7
+y 19
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
+end
+arch shop_empty
+x 8
+y 2
+end
+arch wall_2_1_2
+x 8
+y 2
+end
+arch shop_wands
+x 8
+y 3
+end
+arch shop_wands
+x 8
+y 4
+end
+arch shop_empty
+x 8
+y 5
+end
+arch shop_empty
+x 8
+y 6
+end
+arch shop_empty
+x 8
+y 7
+end
+arch shop_empty
+x 8
+y 8
+end
+arch shop_empty
+x 8
+y 9
+end
+arch shop_empty
+x 8
+y 10
+end
+arch shop_empty
+x 8
+y 11
+end
+arch shop_empty
+x 8
+y 12
+end
+arch shop_empty
+x 8
+y 13
+end
+arch shop_gems
+x 8
+y 14
+end
+arch shop_gems
+x 8
+y 15
+end
+arch shop_gems
+x 8
+y 16
+end
+arch shop_empty
+x 8
+y 17
+end
+arch wall_2_1_2
+x 8
+y 17
+end
+arch grass_only
+x 8
+y 18
+end
+arch grass_only
+x 8
+y 19
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch shop_empty
+x 9
+y 2
+end
+arch wall_2_1_2
+x 9
+y 2
+end
+arch shop_wands
+x 9
+y 3
+end
+arch shop_wands
+x 9
+y 4
+end
+arch light4
+x 9
+y 5
+end
+arch shop_wands
+x 9
+y 5
+end
+arch shop_wands
+x 9
+y 6
+end
+arch shop_wands
+x 9
+y 7
+end
+arch light4
+x 9
+y 8
+end
+arch shop_wands
+x 9
+y 8
+end
+arch shop_wands
+x 9
+y 9
+end
+arch shop_wands
+x 9
+y 10
+end
+arch light4
+x 9
+y 11
+end
+arch shop_wands
+x 9
+y 11
+end
+arch shop_wands
+x 9
+y 12
+end
+arch shop_empty
+x 9
+y 13
+end
+arch shop_gems
+x 9
+y 14
+end
+arch light4
+x 9
+y 15
+end
+arch shop_gems
+x 9
+y 15
+end
+arch shop_gems
+x 9
+y 16
+end
+arch shop_empty
+x 9
+y 17
+end
+arch wall_2_1_2
+x 9
+y 17
+end
+arch grass_only
+x 9
+y 18
+end
+arch grass_only
+x 9
+y 19
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch light2
+x 10
+y 2
+end
+arch shop_empty
+x 10
+y 2
+end
+arch window_win2
+x 10
+y 2
+end
+arch shop_wands
+x 10
+y 3
+end
+arch shop_wands
+x 10
+y 4
+end
+arch shop_wands
+x 10
+y 5
+end
+arch shop_wands
+x 10
+y 6
+end
+arch shop_wands
+x 10
+y 7
+end
+arch shop_wands
+x 10
+y 8
+end
+arch shop_wands
+x 10
+y 9
+end
+arch shop_wands
+x 10
+y 10
+end
+arch shop_wands
+x 10
+y 11
+end
+arch shop_wands
+x 10
+y 12
+end
+arch shop_empty
+x 10
+y 13
+end
+arch shop_gems
+x 10
+y 14
+end
+arch woodfloor
+x 10
+y 15
+end
+arch swall_2_2_2
+x 10
+y 15
+end
+arch woodfloor
+x 10
+y 16
+end
+arch swall_2_1_1
+x 10
+y 16
+end
+arch woodfloor
+x 10
+y 17
+end
+arch wall_2_1_2
+x 10
+y 17
+end
+arch grass_only
+x 10
+y 18
+end
+arch grass_only
+x 10
+y 19
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
+y 1
+end
+arch shop_empty
+x 11
+y 2
+end
+arch wall_2_1_2
+x 11
+y 2
+end
+arch shop_wands
+x 11
+y 3
+end
+arch shop_wands
+x 11
+y 4
+end
+arch shop_empty
+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 shop_empty
+x 11
+y 10
+end
+arch shop_empty
+x 11
+y 11
+end
+arch shop_empty
+x 11
+y 12
+end
+arch shop_empty
+x 11
+y 13
+end
+arch shop_gems
+x 11
+y 14
+end
+arch woodfloor
+x 11
+y 15
+end
+arch swall_2_1_2
+x 11
+y 15
+end
+arch woodfloor
+x 11
+y 16
+end
+arch smith
+name wizard, Klondor
+face wizard.131
+x 11
+y 16
+end
+arch light2
+x 11
+y 17
+end
+arch woodfloor
+x 11
+y 17
+end
+arch window_win2
+x 11
+y 17
+end
+arch grass_only
+x 11
+y 18
+end
+arch grass_only
+x 11
+y 19
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch shop_empty
+x 12
+y 2
+end
+arch wall_2_1_2
+x 12
+y 2
+end
+arch shop_wands
+x 12
+y 3
+end
+arch shop_wands
+x 12
+y 4
+end
+arch light4
+x 12
+y 5
+end
+arch shop_wands
+x 12
+y 5
+end
+arch shop_wands
+x 12
+y 6
+end
+arch shop_wands
+x 12
+y 7
+end
+arch light4
+x 12
+y 8
+end
+arch shop_wands
+x 12
+y 8
+end
+arch shop_wands
+x 12
+y 9
+end
+arch light4
+x 12
+y 10
+end
+arch shop_wands
+x 12
+y 10
+end
+arch shop_empty
+x 12
+y 11
+end
+arch light4
+x 12
+y 12
+end
+arch woodfloor
+x 12
+y 12
+end
+arch swall_2_2_2
+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 light4
+x 12
+y 15
+end
+arch woodfloor
+x 12
+y 15
+end
+arch swall_2_2_4
+x 12
+y 15
+end
 arch magic_mouth
 msg
 Klondor says, "Take your time to check
@@ -459,939 +1281,912 @@ If you have anything to identify, I
 can help you. Just drop 20 gold coins
 for each item."
 endmsg
-x 5
-y 8
+x 12
+y 16
 end
-arch shop_empty
-x 5
-y 8
+arch woodfloor
+x 12
+y 16
 end
 arch identify_table
 name table
-x 5
-y 8
+x 12
+y 16
 end
-arch shop_empty
-x 5
-y 9
-end
-arch smith
-name wizard, Klondor
-msg
-@match Butakis|fortress
-You need to know the password to enter
-the fortress. Otherwise it's going to
-be very dangerous.
-@match password
-Oh, Well. You don't seem to me like a
-bad person; so I will tell you the
-password. It's "windwalk". But don't
-tell anyone else. There is already
-enough trouble these days. Especially
-some thieves start to cause them in the
-fortress.
-@match thief|thieves
-Yes. I heard there is a new found thief
-guild called the ebony tiger. They have
-infiltrated into the fortress. Lord
-Butakis is trying to root them out.
-The guildmaster and guild itself is
-unknown to me or anyone I know.
-@match *
-Take your time to pick the wands you
-want. If you have anything want me to
-identify, drop 20 gold for each.
-Otherwise if you want to ask about
-specific thing, be precise
-endmsg
-face wizard.111
-x 5
-y 9
-end
-arch shop_empty
-x 5
-y 10
+arch woodfloor
+x 12
+y 17
 end
 arch wall_2_1_2
-x 5
-y 10
+x 12
+y 17
 end
-arch shop_empty
-x 5
-y 11
+arch grass_only
+x 12
+y 18
 end
-arch shop_gems
-x 5
-y 12
+arch grass_only
+x 12
+y 19
 end
-arch shop_gems
-x 5
-y 13
+arch grass_only
+x 13
 end
-arch shop_gems
-x 5
-y 14
-end
-arch shop_empty
-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_wands
-x 6
+arch grass_only
+x 13
 y 1
 end
-arch shop_wands
-x 6
+arch shop_empty
+x 13
+y 2
+end
+arch wall_2_1_2
+x 13
 y 2
 end
 arch shop_wands
-x 6
+x 13
 y 3
 end
 arch shop_wands
-x 6
+x 13
 y 4
 end
-arch shop_empty
-x 6
+arch shop_wands
+x 13
 y 5
 end
-arch woodfloor
-x 6
+arch shop_wands
+x 13
 y 6
 end
-arch swall_2_2_2
-x 6
-y 6
-end
-arch woodfloor
-x 6
+arch shop_wands
+x 13
 y 7
 end
-arch swall_2_1_1
-x 6
-y 7
-end
-arch woodfloor
-x 6
+arch shop_wands
+x 13
 y 8
 end
-arch swall_1_2_half
-x 6
-y 8
-end
-arch wall_1_1
-x 6
-y 8
-end
-arch woodfloor
-x 6
+arch shop_wands
+x 13
 y 9
 end
-arch wall_3_2
-x 6
-y 9
-end
-arch shop_empty
-x 6
-y 10
-end
-arch wall_2_2_4
-x 6
+arch shop_wands
+x 13
 y 10
 end
 arch shop_empty
-x 6
+x 13
 y 11
 end
-arch shop_gems
-x 6
-y 12
-end
-arch shop_gems
-x 6
-y 13
-end
-arch shop_gems
-x 6
-y 14
-end
-arch shop_empty
-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_wands
-x 7
-y 1
-end
-arch shop_wands
-x 7
-y 2
-end
-arch shop_wands
-x 7
-y 3
-end
-arch shop_wands
-x 7
-y 4
-end
-arch shop_empty
-x 7
-y 5
-end
 arch woodfloor
-x 7
-y 6
+x 13
+y 12
 end
 arch swall_2_1_2
-x 7
+x 13
+y 12
+end
+arch woodfloor
+x 13
+y 13
+end
+arch woodfloor
+x 13
+y 14
+end
+arch woodfloor
+x 13
+y 15
+end
+arch woodfloor
+x 13
+y 16
+end
+arch woodfloor
+x 13
+y 17
+end
+arch wall_2_1_2
+x 13
+y 17
+end
+arch grass_only
+x 13
+y 18
+end
+arch grass_only
+x 13
+y 19
+end
+arch grass_only
+x 14
+end
+arch grass_only
+x 14
+y 1
+end
+arch light2
+x 14
+y 2
+end
+arch shop_empty
+x 14
+y 2
+end
+arch window_win2
+x 14
+y 2
+end
+arch shop_wands
+x 14
+y 3
+end
+arch shop_wands
+x 14
+y 4
+end
+arch shop_empty
+x 14
+y 5
+end
+arch shop_empty
+x 14
 y 6
 end
-arch woodfloor
-x 7
+arch shop_empty
+x 14
 y 7
 end
-arch shop_mat
-x 7
-y 7
-end
-arch woodfloor
-x 7
+arch shop_empty
+x 14
 y 8
 end
-arch woodfloor
-x 7
+arch shop_empty
+x 14
 y 9
 end
-arch swall_1_4_half
-x 7
-y 9
+arch shop_empty
+x 14
+y 10
+end
+arch shop_empty
+x 14
+y 11
+end
+arch woodfloor
+x 14
+y 12
+end
+arch swall_2_1_2
+x 14
+y 12
+end
+arch woodfloor
+x 14
+y 13
+end
+arch woodfloor
+x 14
+y 14
+end
+arch woodfloor
+x 14
+y 15
+end
+arch button_small
+x 14
+y 16
+connected 1
+end
+arch woodfloor
+x 14
+y 16
+end
+arch woodfloor
+x 14
+y 17
 end
 arch wall_1_3
-x 7
-y 9
+x 14
+y 17
 end
-arch shop_empty
-x 7
-y 10
-end
-arch shop_empty
-x 7
-y 11
-end
-arch shop_empty
-x 7
-y 12
-end
-arch shop_empty
-x 7
-y 13
-end
-arch shop_empty
-x 7
-y 14
-end
-arch shop_empty
-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_wands
-x 8
-y 1
-end
-arch shop_wands
-x 8
-y 2
-end
-arch shop_wands
-x 8
-y 3
-end
-arch shop_wands
-x 8
-y 4
-end
-arch shop_empty
-x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch swall_2_1_2
-x 8
-y 6
-end
-arch woodfloor
-x 8
-y 7
-end
-arch exit
+arch invis_exit
 name back to countryside
 slaying /world/world_109_126
 hp 18
 sp 29
-x 8
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 18
+end
+arch grass_only
+x 14
+y 19
+end
+arch grass_only
+x 15
+end
+arch grass_only
+x 15
+y 1
+end
+arch shop_empty
+x 15
+y 2
+end
+arch wall_2_1_2
+x 15
+y 2
+end
+arch shop_wands
+x 15
+y 3
+end
+arch shop_wands
+x 15
+y 4
+end
+arch light4
+x 15
+y 5
+end
+arch shop_wands
+x 15
+y 5
+end
+arch shop_wands
+x 15
+y 6
+end
+arch shop_wands
+x 15
 y 7
 end
-arch woodfloor
-x 8
+arch light4
+x 15
 y 8
 end
-arch table_2
-x 8
+arch shop_wands
+x 15
 y 8
 end
+arch light4
+x 15
+y 9
+end
+arch shop_wands
+x 15
+y 9
+end
+arch shop_empty
+x 15
+y 10
+end
+arch shop_empty
+x 15
+y 11
+end
+arch woodfloor
+x 15
+y 12
+end
+arch swall_2_1_2
+x 15
+y 12
+end
+arch woodfloor
+x 15
+y 13
+end
+arch menu
+x 15
+y 13
+end
+arch light4
+x 15
+y 14
+end
+arch woodfloor
+x 15
+y 14
+end
+arch woodfloor
+x 15
+y 15
+end
+arch button_small
+x 15
+y 16
+connected 1
+end
+arch woodfloor
+x 15
+y 16
+end
+arch button_small
+x 15
+y 17
+connected 1
+end
+arch woodfloor
+x 15
+y 17
+end
+arch odoorn2_closed_1
+x 15
+y 17
+connected 1
+end
+arch invis_exit
+name back to countryside
+slaying /world/world_109_126
+hp 18
+sp 29
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 18
+end
+arch grass_only
+x 15
+y 19
+end
+arch grass_only
+x 16
+end
+arch grass_only
+x 16
+y 1
+end
+arch shop_empty
+x 16
+y 2
+end
+arch wall_2_1_2
+x 16
+y 2
+end
+arch shop_wands
+x 16
+y 3
+end
+arch light4
+x 16
+y 4
+end
+arch shop_wands
+x 16
+y 4
+end
+arch shop_wands
+x 16
+y 5
+end
+arch shop_wands
+x 16
+y 6
+end
+arch shop_wands
+x 16
+y 7
+end
+arch shop_wands
+x 16
+y 8
+end
+arch shop_wands
+x 16
+y 9
+end
+arch shop_empty
+x 16
+y 10
+end
+arch shop_empty
+x 16
+y 11
+end
+arch shop_mat
+x 16
+y 11
+end
+arch woodfloor
+x 16
+y 12
+end
+arch swall_2_1_2
+x 16
+y 12
+end
+arch woodfloor
+x 16
+y 13
+end
+arch shop_mat
+x 16
+y 13
+end
+arch woodfloor
+x 16
+y 14
+end
+arch woodfloor
+x 16
+y 15
+end
+arch button_small
+x 16
+y 16
+connected 1
+end
+arch woodfloor
+x 16
+y 16
+end
+arch woodfloor
+x 16
+y 17
+end
+arch wall_1_4
+x 16
+y 17
+end
+arch invis_exit
+name back to countryside
+slaying /world/world_109_126
+hp 18
+sp 29
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 18
+end
+arch grass_only
+x 16
+y 19
+end
+arch grass_only
+x 17
+end
+arch grass_only
+x 17
+y 1
+end
+arch shop_empty
+x 17
+y 2
+end
+arch wall_3_3
+x 17
+y 2
+end
+arch shop_empty
+x 17
+y 3
+end
+arch wall_2_2_1
+x 17
+y 3
+end
+arch shop_wands
+x 17
+y 4
+end
+arch shop_wands
+x 17
+y 5
+end
+arch shop_wands
+x 17
+y 6
+end
+arch shop_wands
+x 17
+y 7
+end
+arch shop_wands
+x 17
+y 8
+end
+arch shop_wands
+x 17
+y 9
+end
+arch shop_empty
+x 17
+y 10
+end
+arch shop_empty
+x 17
+y 11
+end
+arch woodfloor
+x 17
+y 12
+end
+arch swall_2_1_2
+x 17
+y 12
+end
+arch woodfloor
+x 17
+y 13
+end
+arch woodfloor
+x 17
+y 14
+end
+arch woodfloor
+x 17
+y 15
+end
+arch table_2
+x 17
+y 15
+end
 arch scroll
 msg
 Hello my friend. Take the beers if
 you'd like. It's my hospitality.
                        -Klondo
 endmsg
-x 8
-y 8
+x 17
+y 15
+no_pick 1
 end
 arch booze
 name free beer
-x 8
-y 8
+x 17
+y 15
 nrof 6
 end
-arch woodfloor
-x 8
-y 9
-end
-arch swall_2_1_2
-x 8
-y 9
-end
-arch shop_empty
-x 8
-y 10
-end
-arch shop_wands
-x 8
-y 11
-end
-arch shop_wands
-x 8
-y 12
-end
-arch shop_wands
-x 8
-y 13
-end
-arch shop_wands
-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_wands
-x 9
-y 1
-end
-arch shop_wands
-x 9
-y 2
-end
-arch shop_wands
-x 9
-y 3
-end
-arch shop_wands
-x 9
-y 4
-end
-arch shop_empty
-x 9
-y 5
+arch light4
+x 17
+y 16
 end
 arch woodfloor
-x 9
-y 6
-end
-arch swall_2_2_3
-x 9
-y 6
-end
-arch woodfloor
-x 9
-y 7
-end
-arch swall_2_1_1
-x 9
-y 7
-end
-arch woodfloor
-x 9
-y 8
-end
-arch swall_2_1_1
-x 9
-y 8
-end
-arch woodfloor
-x 9
-y 9
-end
-arch swall_2_2_4
-x 9
-y 9
-end
-arch shop_empty
-x 9
-y 10
-end
-arch shop_wands
-x 9
-y 11
-end
-arch shop_wands
-x 9
-y 12
-end
-arch shop_wands
-x 9
-y 13
-end
-arch shop_wands
-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_wands
-x 10
-y 1
-end
-arch shop_wands
-x 10
-y 2
-end
-arch shop_wands
-x 10
-y 3
-end
-arch shop_wands
-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_wands
-x 10
-y 11
-end
-arch shop_wands
-x 10
-y 12
-end
-arch shop_wands
-x 10
-y 13
-end
-arch shop_wands
-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_empty
-x 11
-y 1
-end
-arch shop_empty
-x 11
-y 2
-end
-arch shop_empty
-x 11
-y 3
-end
-arch shop_empty
-x 11
-y 4
-end
-arch shop_empty
-x 11
-y 5
-end
-arch shop_wands
-x 11
-y 6
-end
-arch shop_wands
-x 11
-y 7
-end
-arch shop_wands
-x 11
-y 8
-end
-arch shop_empty
-x 11
-y 9
-end
-arch shop_wands
-x 11
-y 10
-end
-arch shop_wands
-x 11
-y 11
-end
-arch shop_wands
-x 11
-y 12
-end
-arch shop_wands
-x 11
-y 13
-end
-arch shop_wands
-x 11
-y 14
-end
-arch shop_empty
-x 11
-y 15
-end
-arch wall_2_1_2
-x 11
-y 15
-end
-arch shop_empty
-x 12
-end
-arch wall_2_1_2
-x 12
-end
-arch shop_wands
-x 12
-y 1
-end
-arch shop_wands
-x 12
-y 2
-end
-arch shop_wands
-x 12
-y 3
-end
-arch shop_wands
-x 12
-y 4
-end
-arch shop_wands
-x 12
-y 5
-end
-arch shop_wands
-x 12
-y 6
-end
-arch shop_wands
-x 12
-y 7
-end
-arch shop_wands
-x 12
-y 8
-end
-arch shop_empty
-x 12
-y 9
-end
-arch shop_wands
-x 12
-y 10
-end
-arch shop_wands
-x 12
-y 11
-end
-arch shop_wands
-x 12
-y 12
-end
-arch shop_wands
-x 12
-y 13
-end
-arch shop_wands
-x 12
-y 14
-end
-arch shop_empty
-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_wands
-x 13
-y 1
-end
-arch shop_wands
-x 13
-y 2
-end
-arch shop_wands
-x 13
-y 3
-end
-arch shop_wands
-x 13
-y 4
-end
-arch shop_wands
-x 13
-y 5
-end
-arch shop_wands
-x 13
-y 6
-end
-arch shop_wands
-x 13
-y 7
-end
-arch shop_wands
-x 13
-y 8
-end
-arch shop_empty
-x 13
-y 9
-end
-arch shop_wands
-x 13
-y 10
-end
-arch shop_wands
-x 13
-y 11
-end
-arch shop_wands
-x 13
-y 12
-end
-arch shop_wands
-x 13
-y 13
-end
-arch shop_wands
-x 13
-y 14
-end
-arch shop_empty
-x 13
-y 15
-end
-arch wall_2_1_2
-x 13
-y 15
-end
-arch shop_empty
-x 14
-end
-arch wall_3_3
-x 14
-end
-arch shop_empty
-x 14
-y 1
-end
-arch wall_2_2_1
-x 14
-y 1
-end
-arch shop_wands
-x 14
-y 2
-end
-arch shop_wands
-x 14
-y 3
-end
-arch shop_wands
-x 14
-y 4
-end
-arch shop_wands
-x 14
-y 5
-end
-arch shop_wands
-x 14
-y 6
-end
-arch shop_wands
-x 14
-y 7
-end
-arch shop_wands
-x 14
-y 8
-end
-arch shop_empty
-x 14
-y 9
-end
-arch shop_wands
-x 14
-y 10
-end
-arch shop_wands
-x 14
-y 11
-end
-arch shop_wands
-x 14
-y 12
-end
-arch shop_wands
-x 14
-y 13
-end
-arch shop_empty
-x 14
-y 14
+x 17
+y 16
 end
 arch wall_2_2_2
-x 14
-y 14
+x 17
+y 16
 end
-arch shop_empty
-x 14
-y 15
+arch woodfloor
+x 17
+y 17
 end
 arch wall_3_1
-x 14
-y 15
+x 17
+y 17
+end
+arch grass_only
+x 17
+y 18
+end
+arch grass_only
+x 17
+y 19
+end
+arch grass_only
+x 18
+end
+arch grass_only
+x 18
+y 1
 end
 arch shop_empty
-x 15
+x 18
+y 2
 end
 arch wall_2_2_3
-x 15
-end
-arch shop_empty
-x 15
-y 1
-end
-arch wall_3_4
-x 15
-y 1
-end
-arch shop_empty
-x 15
-y 2
-end
-arch wall_2_1_1
-x 15
+x 18
 y 2
 end
 arch shop_empty
-x 15
+x 18
 y 3
 end
-arch wall_2_1_1
-x 15
-y 3
-end
-arch shop_empty
-x 15
-y 4
-end
-arch wall_2_1_1
-x 15
-y 4
-end
-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
-x 15
-y 11
-end
-arch shop_empty
-x 15
-y 12
-end
-arch wall_2_1_1
-x 15
-y 12
-end
-arch shop_empty
-x 15
-y 13
-end
-arch wall_2_1_1
-x 15
-y 13
-end
-arch shop_empty
-x 15
-y 14
-end
 arch wall_3_4
-x 15
-y 14
+x 18
+y 3
 end
 arch shop_empty
-x 15
+x 18
+y 4
+end
+arch wall_2_1_1
+x 18
+y 4
+end
+arch shop_empty
+x 18
+y 5
+end
+arch wall_2_1_1
+x 18
+y 5
+end
+arch light2
+x 18
+y 6
+end
+arch shop_empty
+x 18
+y 6
+end
+arch window_win1
+x 18
+y 6
+end
+arch shop_empty
+x 18
+y 7
+end
+arch wall_2_1_1
+x 18
+y 7
+end
+arch shop_empty
+x 18
+y 8
+end
+arch wall_2_1_1
+x 18
+y 8
+end
+arch shop_empty
+x 18
+y 9
+end
+arch wall_2_1_1
+x 18
+y 9
+end
+arch shop_empty
+x 18
+y 10
+end
+arch wall_2_1_1
+x 18
+y 10
+end
+arch shop_empty
+x 18
+y 11
+end
+arch wall_2_1_1
+x 18
+y 11
+end
+arch woodfloor
+x 18
+y 12
+end
+arch wall_2_1_1
+x 18
+y 12
+end
+arch swall_1_3_half
+x 18
+y 12
+end
+arch light2
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 13
+end
+arch window_win1
+x 18
+y 13
+end
+arch woodfloor
+x 18
+y 14
+end
+arch wall_2_1_1
+x 18
+y 14
+end
+arch woodfloor
+x 18
 y 15
 end
+arch wall_2_1_1
+x 18
+y 15
+end
+arch woodfloor
+x 18
+y 16
+end
+arch wall_3_4
+x 18
+y 16
+end
+arch woodfloor
+x 18
+y 17
+end
 arch wall_2_2_4
-x 15
+x 18
+y 17
+end
+arch grass_only
+x 18
+y 18
+end
+arch grass_only
+x 18
+y 19
+end
+arch grass_only
+x 19
+end
+arch grass_only
+x 19
+y 1
+end
+arch grass_only
+x 19
+y 2
+end
+arch grass_only
+x 19
+y 3
+end
+arch grass_only
+x 19
+y 4
+end
+arch grass_only
+x 19
+y 5
+end
+arch grass_only
+x 19
+y 6
+end
+arch grass_only
+x 19
+y 7
+end
+arch grass_only
+x 19
+y 8
+end
+arch grass_only
+x 19
+y 9
+end
+arch grass_only
+x 19
+y 10
+end
+arch grass_only
+x 19
+y 11
+end
+arch grass_only
+x 19
+y 12
+end
+arch grass_only
+x 19
+y 13
+end
+arch grass_only
+x 19
+y 14
+end
+arch grass_only
+x 19
 y 15
 end
+arch grass_only
+x 19
+y 16
+end
+arch grass_only
+x 19
+y 17
+end
+arch grass_only
+x 19
+y 18
+end
+arch grass_only
+x 19
+y 19
+end
+arch grass_only
+x 20
+end
+arch grass_only
+x 20
+y 1
+end
+arch grass_only
+x 20
+y 2
+end
+arch grass_only
+x 20
+y 3
+end
+arch grass_only
+x 20
+y 4
+end
+arch grass_only
+x 20
+y 5
+end
+arch grass_only
+x 20
+y 6
+end
+arch grass_only
+x 20
+y 7
+end
+arch grass_only
+x 20
+y 8
+end
+arch grass_only
+x 20
+y 9
+end
+arch grass_only
+x 20
+y 10
+end
+arch grass_only
+x 20
+y 11
+end
+arch grass_only
+x 20
+y 12
+end
+arch grass_only
+x 20
+y 13
+end
+arch grass_only
+x 20
+y 14
+end
+arch grass_only
+x 20
+y 15
+end
+arch grass_only
+x 20
+y 16
+end
+arch grass_only
+x 20
+y 17
+end
+arch grass_only
+x 20
+y 18
+end
+arch grass_only
+x 20
+y 19
+end
diff --git a/world/world_109_126 b/world/world_109_126
index 9ae292d38..197b93763 100644
--- a/world/world_109_126
+++ b/world/world_109_126
@@ -8,7 +8,7 @@ height 50
 enter_x 25
 enter_y 25
 msg
-Modified: 2011-04-19 Rick Tanner
+Modified: 2011-04-20 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_109_125
@@ -4923,8 +4923,8 @@ end
 arch tavern
 name Klondor's Wand Shop
 slaying /lake_country/shops/klondors_wands
-hp 8
-sp 7
+hp 15
+sp 15
 x 18
 y 29
 end