From cf3e2dd7fd3b1562af320196e19b4b998dc7d344 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 2 Jul 2012 06:46:29 +0000
Subject: [PATCH] Cosmetic and layout changes to Eswald's Coffee Shop
 (scorn/shops/coffeeshop) in Scorn.  Enlarged the map to include area
 surrounding the shop, added some windows. Updated world map
 (world/world_105_116) for map entrance coordinate changes.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18336 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/coffeeshop | 1070 +++++++++++++++++++++++++++-------------
 world/world_105_116    |    6 +-
 2 files changed, 740 insertions(+), 336 deletions(-)

diff --git a/scorn/shops/coffeeshop b/scorn/shops/coffeeshop
index 7ec901ca2..7ac1b5c56 100644
--- a/scorn/shops/coffeeshop
+++ b/scorn/shops/coffeeshop
@@ -2,135 +2,277 @@ arch map
 name Eswald's Coffee Shop
 difficulty 1
 region scorn
-width 10
-height 10
-enter_x 4
-enter_y 8
+width 14
+height 14
+enter_x 9
+enter_y 10
 msg
 Created:  2003-04-27 Avion
-Modified: 2012-01-16 Rick Tanner
+Modified: 2012-07-02 Rick Tanner
 endmsg
 end
+arch cobblestones2
+end
+arch cobblestones2
+y 1
+end
+arch cobblestones2
+y 2
+end
+arch cobblestones2
+y 3
+end
+arch cobblestones2
+y 4
+end
+arch cobblestones2
+y 5
+end
+arch cobblestones2
+y 6
+end
+arch cobblestones2
+y 7
+end
+arch cobblestones2
+y 8
+end
+arch cobblestones2
+y 9
+end
+arch cobblestones2
+y 10
+end
+arch cobblestones2
+y 11
+end
+arch cobblestones2
+y 12
+end
+arch cobblestones2
+y 13
+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 cobblestones2
+x 1
+y 13
+end
+arch grass_only
+x 2
+end
+arch grass_only
+x 2
+y 1
+end
 arch woodfloor2
+x 2
+y 2
 end
 arch wwall_2_2_2
-end
-arch woodfloor2
-y 1
-end
-arch wwall_2_1_1
-y 1
-end
-arch woodfloor2
-y 2
-end
-arch wwall_2_1_1
+x 2
 y 2
 end
 arch woodfloor2
+x 2
 y 3
 end
 arch wwall_2_1_1
+x 2
 y 3
 end
 arch woodfloor2
+x 2
 y 4
 end
 arch wwall_2_1_1
+x 2
 y 4
 end
 arch woodfloor2
+x 2
 y 5
 end
 arch wwall_2_1_1
+x 2
 y 5
 end
 arch woodfloor2
+x 2
 y 6
 end
 arch wwall_2_1_1
+x 2
 y 6
 end
 arch woodfloor2
+x 2
 y 7
 end
-arch wwall_2_1_1
+arch wwall_win1
+x 2
 y 7
 end
 arch woodfloor2
+x 2
 y 8
 end
 arch wwall_2_1_1
+x 2
 y 8
 end
 arch woodfloor2
+x 2
 y 9
 end
+arch wwall_2_1_1
+x 2
+y 9
+end
+arch woodfloor2
+x 2
+y 10
+end
+arch wwall_2_1_1
+x 2
+y 10
+end
+arch woodfloor2
+x 2
+y 11
+end
 arch wwall_2_2_1
-y 9
+x 2
+y 11
+end
+arch grass_only
+x 2
+y 12
+end
+arch cobblestones2
+x 2
+y 13
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
 end
 arch woodfloor2
-x 1
+x 3
+y 2
 end
 arch wwall_2_1_2
-x 1
-end
-arch woodfloor2
-x 1
-y 1
-end
-arch barrel
-x 1
-y 1
-end
-arch woodfloor2
-x 1
-y 2
-end
-arch barrel
-x 1
+x 3
 y 2
 end
 arch woodfloor2
-x 1
+x 3
 y 3
 end
+arch barrel
+x 3
+y 3
+end
+arch woodfloor2
+x 3
+y 4
+end
+arch barrel
+x 3
+y 4
+end
+arch woodfloor2
+x 3
+y 5
+end
 arch longtable_1_4
-x 1
-y 3
+x 3
+y 5
 move_block all
 end
 arch woodfloor2
-x 1
-y 4
+x 3
+y 6
 end
 arch chair_1.1
-x 1
-y 4
+x 3
+y 6
 end
 arch woodfloor2
-x 1
-y 5
+x 3
+y 7
 end
 arch table_3
-x 1
-y 5
+x 3
+y 7
 end
 arch woodfloor2
-x 1
-y 6
+x 3
+y 8
 end
 arch chair_1.3
-x 1
-y 6
+x 3
+y 8
 end
 arch woodfloor2
-x 1
-y 7
+x 3
+y 9
 end
 arch chair_1.1
-x 1
-y 7
+x 3
+y 9
 end
 arch woman
 name Juanita
@@ -144,132 +286,166 @@ Park it and enjoy the java...
 @match *
 Mmmmm, mountain grown.
 endmsg
-x 1
-y 7
+x 3
+y 9
 stand_still 1
 end
 arch woodfloor2
-x 1
-y 8
+x 3
+y 10
 end
 arch table_3
-x 1
-y 8
+x 3
+y 10
 end
 arch woodfloor2
-x 1
-y 9
+x 3
+y 11
 end
 arch wwall_2_1_2
-x 1
-y 9
+x 3
+y 11
 end
-arch woodfloor2
-x 2
+arch grass_only
+x 3
+y 12
 end
-arch wwall_2_1_2
-x 2
+arch cobblestones2
+x 3
+y 13
 end
-arch woodfloor2
-x 2
-y 1
+arch grass_only
+x 4
 end
-arch barrel
-x 2
+arch grass_only
+x 4
 y 1
 end
 arch woodfloor2
-x 2
+x 4
 y 2
 end
+arch wwall_win2
+x 4
+y 2
+end
+arch woodfloor2
+x 4
+y 3
+end
 arch barrel
-x 2
-y 2
-end
-arch woodfloor2
-x 2
+x 4
 y 3
 end
-arch longtable_2_1_2
-x 2
-y 3
-move_block all
-end
 arch woodfloor2
-x 2
+x 4
+y 4
+end
+arch barrel
+x 4
 y 4
 end
 arch woodfloor2
-x 2
+x 4
 y 5
 end
+arch longtable_2_1_2
+x 4
+y 5
+move_block all
+end
 arch woodfloor2
-x 2
+x 4
 y 6
 end
 arch woodfloor2
-x 2
+x 4
 y 7
 end
 arch woodfloor2
-x 2
+x 4
 y 8
 end
+arch woodfloor2
+x 4
+y 9
+end
+arch woodfloor2
+x 4
+y 10
+end
 arch chair_1.2
-x 2
-y 8
+x 4
+y 10
 end
 arch woodfloor2
-x 2
-y 9
+x 4
+y 11
 end
 arch wwall_2_1_2
-x 2
-y 9
+x 4
+y 11
 end
-arch woodfloor2
-x 3
+arch grass_only
+x 4
+y 12
 end
-arch wwall_2_1_2
-x 3
+arch cobblestones2
+x 4
+y 13
 end
-arch woodfloor2
-x 3
-y 1
+arch grass_only
+x 5
 end
-arch barrel
-x 3
+arch grass_only
+x 5
 y 1
 end
 arch woodfloor2
-x 3
+x 5
 y 2
 end
-arch barrel
-x 3
+arch wwall_2_1_2
+x 5
 y 2
 end
 arch woodfloor2
-x 3
+x 5
 y 3
 end
+arch barrel
+x 5
+y 3
+end
+arch woodfloor2
+x 5
+y 4
+end
+arch barrel
+x 5
+y 4
+end
+arch woodfloor2
+x 5
+y 5
+end
 arch longtable_2_2_3
-x 3
-y 3
+x 5
+y 5
 move_block all
 end
 arch woodfloor2
-x 3
-y 4
+x 5
+y 6
 end
 arch longtable_2_2_1
-x 3
-y 4
+x 5
+y 6
 move_block all
 end
 arch woodfloor2
-x 3
-y 5
+x 5
+y 7
 end
 arch food_table
 name Fresh Coffee 4sp
@@ -277,87 +453,100 @@ slaying money
 other_arch coffee
 sp 1
 food 4
-x 3
-y 5
-end
-arch woodfloor2
-x 3
-y 6
-end
-arch woodfloor2
-x 3
+x 5
 y 7
 end
 arch woodfloor2
-x 3
+x 5
 y 8
 end
 arch woodfloor2
-x 3
-y 9
-end
-arch wwall_1_3
-x 3
+x 5
 y 9
 end
 arch woodfloor2
-x 4
+x 5
+y 10
+end
+arch woodfloor2
+x 5
+y 11
+end
+arch wwall_win2
+x 5
+y 11
+end
+arch grass_only
+x 5
+y 12
+end
+arch cobblestones2
+x 5
+y 13
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
+end
+arch woodfloor2
+x 6
+y 2
 end
 arch wwall_2_1_2
-x 4
-end
-arch woodfloor2
-x 4
-y 1
-end
-arch barrel
-x 4
-y 1
-end
-arch woodfloor2
-x 4
-y 2
-end
-arch barrel
-x 4
+x 6
 y 2
 end
 arch woodfloor2
-x 4
+x 6
+y 3
+end
+arch barrel
+x 6
 y 3
 end
 arch woodfloor2
-x 4
+x 6
 y 4
 end
-arch longtable_2_1_2
-x 4
+arch barrel
+x 6
 y 4
-move_block all
 end
 arch woodfloor2
-x 4
+x 6
 y 5
 end
 arch woodfloor2
-x 4
+x 6
 y 6
 end
+arch longtable_2_1_2
+x 6
+y 6
+move_block all
+end
 arch woodfloor2
-x 4
+x 6
 y 7
 end
-arch magic_mouth
-msg
-A wonderful smell wafts through the air.
-endmsg
-food 1
-x 4
+arch woodfloor2
+x 6
 y 8
 end
 arch woodfloor2
-x 4
-y 8
+x 6
+y 9
+end
+arch woodfloor2
+x 6
+y 10
+end
+arch chair_1.4
+x 6
+y 10
 end
 arch invis_exit
 slaying /world/world_105_116
@@ -366,31 +555,52 @@ Ding!
 endmsg
 hp 1
 sp 1
-x 4
-y 9
+x 6
+y 11
 end
 arch woodfloor2
-x 4
-y 9
-end
-arch woodfloor2
-x 5
+x 6
+y 11
 end
 arch wwall_2_1_2
-x 5
+x 6
+y 11
 end
-arch woodfloor2
-x 5
+arch grass_only
+x 6
+y 12
+end
+arch cobblestones2
+x 6
+y 13
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
 y 1
 end
 arch woodfloor2
-x 5
+x 7
+y 2
+end
+arch wwall_win2
+x 7
 y 2
 end
 arch woodfloor2
-x 5
+x 7
 y 3
 end
+arch woodfloor2
+x 7
+y 4
+end
+arch woodfloor2
+x 7
+y 5
+end
 arch man
 name Eswald
 msg
@@ -411,8 +621,8 @@ Well Oled has always been jealous of my goose...
 @match *
 Finest brew east of Navar.
 endmsg
-x 5
-y 3
+x 7
+y 5
 stand_still 1
 arch NPCGift
 arch coffee
@@ -433,292 +643,486 @@ name scorn/shops/eswald.msg
 end
 end
 arch woodfloor2
-x 5
-y 4
+x 7
+y 6
 end
 arch longtable_2_1_2
-x 5
-y 4
+x 7
+y 6
 move_block all
 end
 arch woodfloor2
-x 5
-y 5
-end
-arch woodfloor2
-x 5
-y 6
-end
-arch woodfloor2
-x 5
+x 7
 y 7
 end
 arch woodfloor2
-x 5
+x 7
 y 8
 end
 arch woodfloor2
-x 5
-y 9
-end
-arch wwall_1_4
-x 5
+x 7
 y 9
 end
 arch woodfloor2
-x 6
+x 7
+y 10
+end
+arch table_3
+x 7
+y 10
+end
+arch woodfloor2
+x 7
+y 11
 end
 arch wwall_2_1_2
-x 6
+x 7
+y 11
+end
+arch grass_only
+x 7
+y 12
+end
+arch cobblestones2
+x 7
+y 13
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
+y 1
 end
 arch woodfloor2
-x 6
-y 1
+x 8
+y 2
+end
+arch wwall_2_1_2
+x 8
+y 2
+end
+arch woodfloor2
+x 8
+y 3
 end
 arch clock
-x 6
-y 1
-end
-arch woodfloor2
-x 6
-y 2
-end
-arch woodfloor2
-x 6
+x 8
 y 3
 end
 arch woodfloor2
-x 6
+x 8
 y 4
 end
-arch longtable_2_1_2
-x 6
-y 4
-move_block all
-end
 arch woodfloor2
-x 6
+x 8
 y 5
 end
 arch woodfloor2
-x 6
+x 8
 y 6
 end
+arch longtable_2_1_2
+x 8
+y 6
+move_block all
+end
 arch woodfloor2
-x 6
+x 8
 y 7
 end
 arch woodfloor2
-x 6
+x 8
 y 8
 end
 arch woodfloor2
-x 6
-y 9
-end
-arch wwall_2_1_2
-x 6
+x 8
 y 9
 end
 arch woodfloor2
-x 7
+x 8
+y 10
+end
+arch woodfloor2
+x 8
+y 11
+end
+arch wwall_1_3
+x 8
+y 11
+end
+arch grass_only
+x 8
+y 12
+end
+arch cobblestones2
+x 8
+y 13
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch woodfloor2
+x 9
+y 2
 end
 arch wwall_2_2_3
-x 7
+x 9
+y 2
 end
 arch woodfloor2
-x 7
-y 1
+x 9
+y 3
 end
 arch wwall_2_1_1
-x 7
-y 1
+x 9
+y 3
 end
 arch woodfloor2
-x 7
-y 2
+x 9
+y 4
 end
 arch wwall_2_2_1
-x 7
-y 2
-end
-arch woodfloor2
-x 7
-y 3
-end
-arch woodfloor2
-x 7
+x 9
 y 4
 end
+arch woodfloor2
+x 9
+y 5
+end
+arch woodfloor2
+x 9
+y 6
+end
 arch longtable_2_1_2
-x 7
-y 4
+x 9
+y 6
 move_block all
 end
 arch woodfloor2
-x 7
-y 5
-end
-arch woodfloor2
-x 7
-y 6
-end
-arch chair_1.4
-x 7
-y 6
-end
-arch woodfloor2
-x 7
+x 9
 y 7
 end
 arch woodfloor2
-x 7
+x 9
 y 8
 end
 arch chair_1.4
-x 7
+x 9
 y 8
 end
 arch woodfloor2
-x 7
+x 9
 y 9
 end
-arch wwall_2_1_2
-x 7
-y 9
+arch magic_mouth
+msg
+A wonderful smell wafts through the air.
+endmsg
+food 1
+x 9
+y 10
 end
-arch blocked
-x 8
+arch woodfloor2
+x 9
+y 10
 end
-arch blocked
-x 8
+arch invis_exit
+slaying /world/world_105_116
+msg
+Ding!
+endmsg
+hp 1
+sp 1
+x 9
+y 11
+end
+arch woodfloor2
+x 9
+y 11
+end
+arch grass_only
+x 9
+y 12
+end
+arch cobblestones2
+x 9
+y 13
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
 y 1
 end
-arch woodfloor2
-x 8
+arch grass_only
+x 10
 y 2
 end
-arch wwall_2_1_2
-x 8
-y 2
-end
-arch woodfloor2
-x 8
+arch grass_only
+x 10
 y 3
 end
 arch woodfloor2
-x 8
+x 10
 y 4
 end
+arch wwall_win2
+x 10
+y 4
+end
+arch woodfloor2
+x 10
+y 5
+end
+arch woodfloor2
+x 10
+y 6
+end
 arch longtable_1_3
-x 8
-y 4
+x 10
+y 6
 move_block all
 end
 arch woodfloor2
-x 8
-y 5
+x 10
+y 7
 end
 arch chair_1.1
-x 8
-y 5
-end
-arch woodfloor2
-x 8
-y 6
-end
-arch table_3
-x 8
-y 6
-end
-arch woodfloor2
-x 8
+x 10
 y 7
 end
 arch woodfloor2
-x 8
+x 10
 y 8
 end
 arch table_3
-x 8
+x 10
 y 8
 end
 arch woodfloor2
-x 8
+x 10
 y 9
 end
-arch wwall_2_1_2
-x 8
-y 9
+arch woodfloor2
+x 10
+y 10
 end
-arch blocked
-x 9
+arch woodfloor2
+x 10
+y 11
 end
-arch blocked
-x 9
+arch wwall_1_4
+x 10
+y 11
+end
+arch grass_only
+x 10
+y 12
+end
+arch cobblestones2
+x 10
+y 13
+end
+arch grass_only
+x 11
+end
+arch grass_only
+x 11
 y 1
 end
-arch woodfloor2
-x 9
+arch grass_only
+x 11
 y 2
 end
+arch grass_only
+x 11
+y 3
+end
+arch woodfloor2
+x 11
+y 4
+end
 arch wwall_2_2_3
-x 9
-y 2
-end
-arch woodfloor2
-x 9
-y 3
-end
-arch wwall_2_1_1
-x 9
-y 3
-end
-arch woodfloor2
-x 9
-y 4
-end
-arch wwall_2_1_1
-x 9
+x 11
 y 4
 end
 arch woodfloor2
-x 9
+x 11
 y 5
 end
 arch wwall_2_1_1
-x 9
+x 11
 y 5
 end
 arch woodfloor2
-x 9
+x 11
 y 6
 end
 arch wwall_2_1_1
-x 9
+x 11
 y 6
 end
 arch woodfloor2
-x 9
+x 11
 y 7
 end
-arch wwall_2_1_1
-x 9
+arch wwall_win1
+x 11
 y 7
 end
 arch woodfloor2
-x 9
+x 11
 y 8
 end
 arch wwall_2_1_1
-x 9
+x 11
 y 8
 end
 arch woodfloor2
-x 9
+x 11
 y 9
 end
+arch wwall_2_1_1
+x 11
+y 9
+end
+arch woodfloor2
+x 11
+y 10
+end
+arch wwall_2_1_1
+x 11
+y 10
+end
+arch woodfloor2
+x 11
+y 11
+end
 arch wwall_2_2_4
-x 9
+x 11
+y 11
+end
+arch grass_only
+x 11
+y 12
+end
+arch cobblestones2
+x 11
+y 13
+end
+arch grass_only
+x 12
+end
+arch grass_only
+x 12
+y 1
+end
+arch grass_only
+x 12
+y 2
+end
+arch grass_only
+x 12
+y 3
+end
+arch grass_only
+x 12
+y 4
+end
+arch grass_only
+x 12
+y 5
+end
+arch grass_only
+x 12
+y 6
+end
+arch grass_only
+x 12
+y 7
+end
+arch grass_only
+x 12
+y 8
+end
+arch grass_only
+x 12
 y 9
 end
+arch grass_only
+x 12
+y 10
+end
+arch grass_only
+x 12
+y 11
+end
+arch grass_only
+x 12
+y 12
+end
+arch cobblestones2
+x 12
+y 13
+end
+arch grass_only
+x 13
+end
+arch grass_only
+x 13
+y 1
+end
+arch grass_only
+x 13
+y 2
+end
+arch grass_only
+x 13
+y 3
+end
+arch grass_only
+x 13
+y 4
+end
+arch grass_only
+x 13
+y 5
+end
+arch grass_only
+x 13
+y 6
+end
+arch grass_only
+x 13
+y 7
+end
+arch grass_only
+x 13
+y 8
+end
+arch grass_only
+x 13
+y 9
+end
+arch grass_only
+x 13
+y 10
+end
+arch grass_only
+x 13
+y 11
+end
+arch grass_only
+x 13
+y 12
+end
+arch cobblestones2
+x 13
+y 13
+end
diff --git a/world/world_105_116 b/world/world_105_116
index b3863bd64..4884c7e4e 100644
--- a/world/world_105_116
+++ b/world/world_105_116
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2012-06-24 Rick Tanner
+Modified: 2012-07-02 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_115
@@ -279,8 +279,8 @@ slaying /scorn/shops/coffeeshop
 msg
 Ding!
 endmsg
-hp 4
-sp 8
+hp 9
+sp 10
 x 1
 y 1
 end