From e86e79ea1cdd3f8da09e95c46bff05e731368f30 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Tue, 8 May 2012 06:22:35 +0000
Subject: [PATCH] Enlarged the lobby area of Food Shop Warehouse
 (scorn/shops/foodshop) in Scorn to give players more room to move around each
 other.  Updated world map to reflect changes in entrance coordinates.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@18079 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/shops/foodshop | 482 ++++++++++++++++++++++++++++---------------
 world/world_104_115  |   4 +-
 2 files changed, 320 insertions(+), 166 deletions(-)

diff --git a/scorn/shops/foodshop b/scorn/shops/foodshop
index 4b284ffe2..81e2195f9 100644
--- a/scorn/shops/foodshop
+++ b/scorn/shops/foodshop
@@ -6,12 +6,12 @@ shopitems food:95;*:-100
 shopmax 2000
 shoprace dwarf
 width 15
-height 22
+height 24
 enter_x 5
-enter_y 16
+enter_y 18
 msg
 Created:  1993-10-15 MikeeUSA
-Modified: 2011-11-12 Rick Tanner
+Modified: 2012-05-08 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -81,6 +81,12 @@ arch grass_only
 y 21
 end
 arch grass_only
+y 22
+end
+arch grass_only
+y 23
+end
+arch grass_only
 x 1
 end
 arch grass_only
@@ -168,6 +174,14 @@ x 1
 y 21
 end
 arch grass_only
+x 1
+y 22
+end
+arch grass_only
+x 1
+y 23
+end
+arch grass_only
 x 2
 end
 arch grass_only
@@ -255,6 +269,14 @@ x 2
 y 21
 end
 arch grass_only
+x 2
+y 22
+end
+arch grass_only
+x 2
+y 23
+end
+arch grass_only
 x 3
 end
 arch grass_only
@@ -301,7 +323,7 @@ arch shop_empty
 x 3
 y 7
 end
-arch stwall_1_2
+arch stwall_2_1_1
 x 3
 y 7
 end
@@ -309,7 +331,7 @@ arch shop_empty
 x 3
 y 8
 end
-arch wall_1_1
+arch stwall_1_2
 x 3
 y 8
 end
@@ -317,7 +339,7 @@ arch shop_empty
 x 3
 y 9
 end
-arch wall_1_2
+arch wall_1_1
 x 3
 y 9
 end
@@ -325,7 +347,7 @@ arch shop_empty
 x 3
 y 10
 end
-arch stwall_0
+arch wall_1_2
 x 3
 y 10
 end
@@ -333,7 +355,7 @@ arch shop_empty
 x 3
 y 11
 end
-arch wall_1_1
+arch stwall_0
 x 3
 y 11
 end
@@ -341,7 +363,7 @@ arch shop_empty
 x 3
 y 12
 end
-arch wall_1_2
+arch wall_1_1
 x 3
 y 12
 end
@@ -349,7 +371,7 @@ arch shop_empty
 x 3
 y 13
 end
-arch stwall_1_1
+arch wall_1_2
 x 3
 y 13
 end
@@ -357,7 +379,7 @@ arch shop_empty
 x 3
 y 14
 end
-arch stwall_2_1_1
+arch stwall_1_1
 x 3
 y 14
 end
@@ -365,16 +387,16 @@ arch shop_empty
 x 3
 y 15
 end
+arch stwall_2_1_1
+x 3
+y 15
+end
+arch shop_empty
+x 3
+y 16
+end
 arch swall_1_4_half
 x 3
-y 15
-end
-arch stwall_2_1_1
-x 3
-y 15
-end
-arch shop_empty
-x 3
 y 16
 end
 arch stwall_2_1_1
@@ -389,23 +411,31 @@ arch stwall_2_1_1
 x 3
 y 17
 end
-arch light4
-x 3
-y 18
-end
 arch shop_empty
 x 3
 y 18
 end
-arch stwall_2_2_1
+arch stwall_2_1_1
 x 3
 y 18
 end
-arch grass_only
+arch shop_empty
 x 3
 y 19
 end
-arch grass_only
+arch stwall_2_1_1
+x 3
+y 19
+end
+arch light4
+x 3
+y 20
+end
+arch shop_empty
+x 3
+y 20
+end
+arch stwall_2_2_1
 x 3
 y 20
 end
@@ -414,6 +444,14 @@ x 3
 y 21
 end
 arch grass_only
+x 3
+y 22
+end
+arch grass_only
+x 3
+y 23
+end
+arch grass_only
 x 4
 end
 arch grass_only
@@ -472,75 +510,85 @@ arch shop_food
 x 4
 y 13
 end
-arch shop_empty
+arch shop_food
 x 4
 y 14
 end
+arch shop_empty
+x 4
+y 15
+end
 arch shop_mat
 x 4
-y 14
+y 15
 end
 arch shop_empty
 x 4
-y 15
+y 16
 end
 arch swall_2_1_2
 x 4
-y 15
+y 16
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 4
-y 16
+y 17
 end
 arch shop_mat
 x 4
-y 16
+y 17
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 4
+y 18
 end
 arch button_small
 x 4
-y 17
+y 19
 connected 1
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 4
-y 17
+y 19
 end
 arch shop_empty
 x 4
-y 18
+y 20
 end
 arch stwall_1_3
 x 4
-y 18
+y 20
 end
 arch dungeon_magic
 x 4
-y 19
+y 21
 end
 arch invis_exit
 slaying /world/world_104_115
 hp 49
 sp 32
 x 4
-y 19
-end
-arch grass_only
-x 4
-y 19
-end
-arch grass_only
-x 4
-y 20
+y 21
 end
 arch grass_only
 x 4
 y 21
 end
 arch grass_only
+x 4
+y 22
+end
+arch grass_only
+x 4
+y 23
+end
+arch grass_only
 x 5
 end
 arch grass_only
@@ -579,6 +627,10 @@ arch shop_empty
 x 5
 y 6
 end
+arch light4
+x 5
+y 7
+end
 arch shop_empty
 x 5
 y 7
@@ -591,14 +643,14 @@ arch shop_empty
 x 5
 y 9
 end
-arch light4
-x 5
-y 10
-end
 arch shop_empty
 x 5
 y 10
 end
+arch light4
+x 5
+y 11
+end
 arch shop_empty
 x 5
 y 11
@@ -619,35 +671,23 @@ arch shop_empty
 x 5
 y 15
 end
+arch shop_empty
+x 5
+y 16
+end
 arch swall_2_1_2
 x 5
-y 15
+y 16
 end
 arch flagstone
 name floor
 face shop_empty.111
 x 5
-y 16
+y 17
 end
 arch menu
 x 5
-y 16
-end
-arch button_small
-x 5
 y 17
-connected 1
-end
-arch flagstone
-name floor
-face shop_empty.111
-x 5
-y 17
-end
-arch button_small
-x 5
-y 18
-connected 1
 end
 arch flagstone
 name floor
@@ -655,35 +695,57 @@ face shop_empty.111
 x 5
 y 18
 end
+arch button_small
+x 5
+y 19
+connected 1
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 5
+y 19
+end
+arch button_small
+x 5
+y 20
+connected 1
+end
+arch flagstone
+name floor
+face shop_empty.111
+x 5
+y 20
+end
 arch odoorn2_closed_1
 x 5
-y 18
+y 20
 connected 1
 end
 arch dungeon_magic
 x 5
-y 19
+y 21
 end
 arch invis_exit
 slaying /world/world_104_115
 hp 49
 sp 32
 x 5
-y 19
-end
-arch grass_only
-x 5
-y 19
-end
-arch grass_only
-x 5
-y 20
+y 21
 end
 arch grass_only
 x 5
 y 21
 end
 arch grass_only
+x 5
+y 22
+end
+arch grass_only
+x 5
+y 23
+end
+arch grass_only
 x 6
 end
 arch grass_only
@@ -742,37 +804,33 @@ arch shop_food
 x 6
 y 13
 end
-arch shop_empty
+arch shop_food
 x 6
 y 14
 end
-arch light4
-x 6
-y 15
-end
 arch shop_empty
 x 6
 y 15
 end
+arch light4
+x 6
+y 16
+end
+arch shop_empty
+x 6
+y 16
+end
 arch swall_2_2_3
 x 6
-y 15
+y 16
 end
 arch stwall_0
 x 6
-y 15
+y 16
 blocksview 0
 end
 arch shop_empty
 x 6
-y 16
-end
-arch swall_2_1_1
-x 6
-y 16
-end
-arch shop_empty
-x 6
 y 17
 end
 arch swall_2_1_1
@@ -783,38 +841,54 @@ arch shop_empty
 x 6
 y 18
 end
+arch swall_2_1_1
+x 6
+y 18
+end
+arch shop_empty
+x 6
+y 19
+end
+arch swall_2_1_1
+x 6
+y 19
+end
+arch shop_empty
+x 6
+y 20
+end
 arch swall_1_2_half
 x 6
-y 18
+y 20
 end
 arch stwall_1_4
 x 6
-y 18
+y 20
 end
 arch dungeon_magic
 x 6
-y 19
+y 21
 end
 arch invis_exit
 slaying /world/world_104_115
 hp 49
 sp 32
 x 6
-y 19
-end
-arch grass_only
-x 6
-y 19
-end
-arch grass_only
-x 6
-y 20
+y 21
 end
 arch grass_only
 x 6
 y 21
 end
 arch grass_only
+x 6
+y 22
+end
+arch grass_only
+x 6
+y 23
+end
+arch grass_only
 x 7
 end
 arch grass_only
@@ -873,7 +947,7 @@ arch shop_food
 x 7
 y 13
 end
-arch shop_empty
+arch shop_food
 x 7
 y 14
 end
@@ -885,7 +959,7 @@ arch shop_empty
 x 7
 y 16
 end
-arch shop_food
+arch shop_empty
 x 7
 y 17
 end
@@ -893,15 +967,15 @@ arch shop_empty
 x 7
 y 18
 end
-arch stwall_2_1_2
-x 7
-y 18
-end
-arch grass_only
+arch shop_food
 x 7
 y 19
 end
-arch grass_only
+arch shop_empty
+x 7
+y 20
+end
+arch stwall_2_1_2
 x 7
 y 20
 end
@@ -910,6 +984,14 @@ x 7
 y 21
 end
 arch grass_only
+x 7
+y 22
+end
+arch grass_only
+x 7
+y 23
+end
+arch grass_only
 x 8
 end
 arch grass_only
@@ -976,11 +1058,11 @@ arch shop_food
 x 8
 y 15
 end
-arch shop_empty
+arch shop_food
 x 8
 y 16
 end
-arch shop_food
+arch shop_empty
 x 8
 y 17
 end
@@ -988,15 +1070,15 @@ arch shop_empty
 x 8
 y 18
 end
-arch stwall_2_1_2
-x 8
-y 18
-end
-arch grass_only
+arch shop_food
 x 8
 y 19
 end
-arch grass_only
+arch shop_empty
+x 8
+y 20
+end
+arch stwall_2_1_2
 x 8
 y 20
 end
@@ -1005,6 +1087,14 @@ x 8
 y 21
 end
 arch grass_only
+x 8
+y 22
+end
+arch grass_only
+x 8
+y 23
+end
+arch grass_only
 x 9
 end
 arch grass_only
@@ -1053,6 +1143,10 @@ arch shop_empty
 x 9
 y 6
 end
+arch light4
+x 9
+y 7
+end
 arch shop_empty
 x 9
 y 7
@@ -1065,14 +1159,14 @@ arch shop_empty
 x 9
 y 9
 end
-arch light4
-x 9
-y 10
-end
 arch shop_empty
 x 9
 y 10
 end
+arch light4
+x 9
+y 11
+end
 arch shop_empty
 x 9
 y 11
@@ -1093,15 +1187,15 @@ arch shop_empty
 x 9
 y 15
 end
-arch light4
-x 9
-y 16
-end
 arch shop_empty
 x 9
 y 16
 end
-arch shop_food
+arch light4
+x 9
+y 17
+end
+arch shop_empty
 x 9
 y 17
 end
@@ -1113,15 +1207,19 @@ arch shop_empty
 x 9
 y 18
 end
-arch stwindow_win2
-x 9
-y 18
-end
-arch grass_only
+arch shop_food
 x 9
 y 19
 end
-arch grass_only
+arch light4
+x 9
+y 20
+end
+arch shop_empty
+x 9
+y 20
+end
+arch stwindow_win2
 x 9
 y 20
 end
@@ -1130,6 +1228,14 @@ x 9
 y 21
 end
 arch grass_only
+x 9
+y 22
+end
+arch grass_only
+x 9
+y 23
+end
+arch grass_only
 x 10
 end
 arch grass_only
@@ -1204,19 +1310,19 @@ arch shop_food
 x 10
 y 17
 end
-arch shop_empty
+arch shop_food
 x 10
 y 18
 end
-arch stwall_2_1_2
-x 10
-y 18
-end
-arch grass_only
+arch shop_food
 x 10
 y 19
 end
-arch grass_only
+arch shop_empty
+x 10
+y 20
+end
+arch stwall_2_1_2
 x 10
 y 20
 end
@@ -1225,6 +1331,14 @@ x 10
 y 21
 end
 arch grass_only
+x 10
+y 22
+end
+arch grass_only
+x 10
+y 23
+end
+arch grass_only
 x 11
 end
 arch grass_only
@@ -1267,23 +1381,23 @@ arch stwall_2_1_1
 x 11
 y 6
 end
-arch light4
-x 11
-y 7
-end
 arch shop_empty
 x 11
 y 7
 end
-arch stwindow_win1
+arch stwall_2_1_1
 x 11
 y 7
 end
+arch light4
+x 11
+y 8
+end
 arch shop_empty
 x 11
 y 8
 end
-arch stwall_2_1_1
+arch stwindow_win1
 x 11
 y 8
 end
@@ -1327,23 +1441,23 @@ arch stwall_2_1_1
 x 11
 y 13
 end
-arch light4
-x 11
-y 14
-end
 arch shop_empty
 x 11
 y 14
 end
-arch stwindow_win1
+arch stwall_2_1_1
 x 11
 y 14
 end
+arch light4
+x 11
+y 15
+end
 arch shop_empty
 x 11
 y 15
 end
-arch stwall_2_1_1
+arch stwindow_win1
 x 11
 y 15
 end
@@ -1367,16 +1481,24 @@ arch shop_empty
 x 11
 y 18
 end
+arch stwall_2_1_1
+x 11
+y 18
+end
+arch shop_empty
+x 11
+y 19
+end
+arch stwall_2_1_1
+x 11
+y 19
+end
+arch shop_empty
+x 11
+y 20
+end
 arch stwall_2_2_4
 x 11
-y 18
-end
-arch grass_only
-x 11
-y 19
-end
-arch grass_only
-x 11
 y 20
 end
 arch grass_only
@@ -1384,6 +1506,14 @@ x 11
 y 21
 end
 arch grass_only
+x 11
+y 22
+end
+arch grass_only
+x 11
+y 23
+end
+arch grass_only
 x 12
 end
 arch grass_only
@@ -1471,6 +1601,14 @@ x 12
 y 21
 end
 arch grass_only
+x 12
+y 22
+end
+arch grass_only
+x 12
+y 23
+end
+arch grass_only
 x 13
 end
 arch grass_only
@@ -1558,6 +1696,14 @@ x 13
 y 21
 end
 arch grass_only
+x 13
+y 22
+end
+arch grass_only
+x 13
+y 23
+end
+arch grass_only
 x 14
 end
 arch grass_only
@@ -1644,3 +1790,11 @@ arch grass_only
 x 14
 y 21
 end
+arch grass_only
+x 14
+y 22
+end
+arch grass_only
+x 14
+y 23
+end
diff --git a/world/world_104_115 b/world/world_104_115
index 7dc0ad59f..a8a21f7ed 100644
--- a/world/world_104_115
+++ b/world/world_104_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2012-04-29 Rick Tanner
+Modified: 2012-05-08 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -14857,7 +14857,7 @@ arch barrack_up
 name Food Shop Warehouse
 slaying /scorn/shops/foodshop
 hp 5
-sp 16
+sp 18
 x 49
 y 31
 end