From 7945d560b8807e7bad9c9d6d0619c93dd82d129d Mon Sep 17 00:00:00 2001
From: partmedia <partmedia@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sat, 29 Jul 2017 19:40:28 +0000
Subject: [PATCH] Reorganize Scorn

- Move Barracks and Mess Hall to castle keep
- Move Fun House and Random House to southeast near arena
- Move Wizard Workshop to row of crafting buildings
- Remove closed buildings in central Scorn
- Adjust other buildings to fill in gaps

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@20460 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 scorn/houses/barracks     |  14 +--
 scorn/houses/doors_galore |   4 +-
 scorn/houses/maze1        |   6 +-
 scorn/houses/messhall     |  14 +--
 scorn/houses/wizardw      |  14 +--
 scorn/shops/foodshop      |  14 +--
 world/world_104_115       |  60 ++++--------
 world/world_104_116       |  15 +--
 world/world_105_115       | 194 +++++++++++++++++++-------------------
 world/world_105_116       |  11 +--
 10 files changed, 155 insertions(+), 191 deletions(-)

diff --git a/scorn/houses/barracks b/scorn/houses/barracks
index a2db4df38..b0f41b6b7 100644
--- a/scorn/houses/barracks
+++ b/scorn/houses/barracks
@@ -9,7 +9,7 @@ enter_x 24
 enter_y 4
 msg
 Created:  2003-01-04
-Modified: 2008-12-21 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 end
 arch cobblestones2
@@ -1596,9 +1596,9 @@ x 24
 y 3
 end
 arch invis_exit
-slaying /world/world_104_115
-hp 46
-sp 34
+slaying /world/world_105_115
+hp 0
+sp 43
 x 24
 y 4
 end
@@ -1607,9 +1607,9 @@ x 24
 y 4
 end
 arch invis_exit
-slaying /world/world_104_115
-hp 46
-sp 34
+slaying /world/world_105_115
+hp 0
+sp 43
 x 24
 y 5
 end
diff --git a/scorn/houses/doors_galore b/scorn/houses/doors_galore
index 86d48cba5..e265bd2b9 100644
--- a/scorn/houses/doors_galore
+++ b/scorn/houses/doors_galore
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 16
 msg
 Created:  2010-08-22 Khaleh (map) and  Nicolas Weeger (script)
-Modified: 2012-03-26 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 end
 arch hills_rocky
@@ -5755,7 +5755,7 @@ end
 arch westguard_house_3
 slaying /world/world_105_115
 hp 15
-sp 43
+sp 42
 x 14
 y 17
 end
diff --git a/scorn/houses/maze1 b/scorn/houses/maze1
index 5d65ac192..8ff666056 100644
--- a/scorn/houses/maze1
+++ b/scorn/houses/maze1
@@ -8,7 +8,7 @@ enter_x 3
 enter_y 20
 msg
 Created:  1994-11-13
-Modified: 2012-06-26 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 end
 arch grass_only
@@ -391,8 +391,8 @@ y 20
 end
 arch oakdoor_1
 slaying /world/world_105_115
-hp 10
-sp 35
+hp 14
+sp 42
 x 2
 y 20
 end
diff --git a/scorn/houses/messhall b/scorn/houses/messhall
index 780d20037..ed1911658 100644
--- a/scorn/houses/messhall
+++ b/scorn/houses/messhall
@@ -9,7 +9,7 @@ enter_x 24
 enter_y 4
 msg
 Created:  2003-02-04
-Modified: 2012-01-09 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 end
 arch cobblestones2
@@ -1714,9 +1714,9 @@ x 24
 y 3
 end
 arch invis_exit
-slaying /world/world_104_115
-hp 46
-sp 35
+slaying /world/world_105_115
+hp 0
+sp 48
 x 24
 y 4
 end
@@ -1725,9 +1725,9 @@ x 24
 y 4
 end
 arch invis_exit
-slaying /world/world_104_115
-hp 46
-sp 35
+slaying /world/world_105_115
+hp 0
+sp 48
 x 24
 y 5
 end
diff --git a/scorn/houses/wizardw b/scorn/houses/wizardw
index 78e54cb6e..51cad28cd 100644
--- a/scorn/houses/wizardw
+++ b/scorn/houses/wizardw
@@ -9,7 +9,7 @@ enter_x 4
 enter_y 13
 msg
 Created:  2002-12-28
-Modified: 2011-10-24 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 outdoor 1
 end
@@ -706,8 +706,8 @@ y 16
 end
 arch invis_exit
 slaying /world/world_105_115
-hp 11
-sp 43
+hp 15
+sp 39
 x 5
 y 16
 end
@@ -883,8 +883,8 @@ y 16
 end
 arch invis_exit
 slaying /world/world_105_115
-hp 11
-sp 43
+hp 15
+sp 39
 x 6
 y 16
 end
@@ -1028,8 +1028,8 @@ y 16
 end
 arch invis_exit
 slaying /world/world_105_115
-hp 11
-sp 43
+hp 15
+sp 39
 x 7
 y 16
 end
diff --git a/scorn/shops/foodshop b/scorn/shops/foodshop
index a0a830571..83055b1d3 100644
--- a/scorn/shops/foodshop
+++ b/scorn/shops/foodshop
@@ -10,7 +10,7 @@ enter_x 5
 enter_y 18
 msg
 Created:  1993-10-15 MikeeUSA
-Modified: 2013-07-29 Kevin Zheng
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 outdoor 1
 end
@@ -570,8 +570,8 @@ y 21
 end
 arch invis_exit
 slaying /world/world_104_115
-hp 49
-sp 32
+hp 47
+sp 34
 x 4
 y 21
 end
@@ -711,8 +711,8 @@ y 21
 end
 arch invis_exit
 slaying /world/world_104_115
-hp 49
-sp 32
+hp 47
+sp 34
 x 5
 y 21
 end
@@ -857,8 +857,8 @@ y 21
 end
 arch invis_exit
 slaying /world/world_104_115
-hp 49
-sp 32
+hp 47
+sp 34
 x 6
 y 21
 end
diff --git a/world/world_104_115 b/world/world_104_115
index d88baad19..a3a2bfd2c 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: 2016-06-25 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_104_114
@@ -11658,6 +11658,10 @@ arch dungeon_magic
 x 41
 y 32
 end
+arch light1
+x 41
+y 32
+end
 arch grass
 x 41
 y 32
@@ -11714,10 +11718,6 @@ arch grass
 x 41
 y 37
 end
-arch house_2
-x 41
-y 37
-end
 arch dungeon_magic
 x 41
 y 38
@@ -12471,10 +12471,6 @@ arch brush
 x 43
 y 32
 end
-arch well
-x 43
-y 32
-end
 arch dungeon_magic
 x 43
 y 33
@@ -12503,6 +12499,10 @@ arch dungeon_magic
 x 43
 y 35
 end
+arch light1
+x 43
+y 35
+end
 arch grass
 x 43
 y 35
@@ -13703,14 +13703,6 @@ arch grass
 x 46
 y 34
 end
-arch barrack_long
-name Barracks
-slaying /scorn/houses/barracks
-hp 24
-sp 4
-x 46
-y 34
-end
 arch dungeon_magic
 x 46
 y 35
@@ -13719,14 +13711,6 @@ arch grass
 x 46
 y 35
 end
-arch barrack_long
-name Mess Hall
-slaying /scorn/houses/messhall
-hp 24
-sp 4
-x 46
-y 35
-end
 arch dungeon_magic
 x 46
 y 36
@@ -14101,7 +14085,15 @@ arch dungeon_magic
 x 47
 y 34
 end
-arch grass
+arch brush
+x 47
+y 34
+end
+arch barrack_up
+name Food Shop Warehouse
+slaying /scorn/shops/foodshop
+hp 5
+sp 18
 x 47
 y 34
 end
@@ -14847,29 +14839,15 @@ arch dungeon_magic
 x 49
 y 31
 end
-arch swall_0
-name no pass
-x 49
-y 31
-invisible 1
-end
 arch brush
 x 49
 y 31
 end
-arch barrack_up
-name Food Shop Warehouse
-slaying /scorn/shops/foodshop
-hp 5
-sp 18
-x 49
-y 31
-end
 arch dungeon_magic
 x 49
 y 32
 end
-arch brush
+arch grasspond
 x 49
 y 32
 end
diff --git a/world/world_104_116 b/world/world_104_116
index 2ef630329..afc269df4 100644
--- a/world/world_104_116
+++ b/world/world_104_116
@@ -4,7 +4,7 @@ region scorn
 width 50
 height 50
 msg
-Modified: 2014-06-05 Kevin Zheng
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_104_115
@@ -10656,9 +10656,6 @@ arch grass
 x 41
 elevation 15244
 end
-arch barrack_long
-x 41
-end
 arch grass
 x 41
 y 1
@@ -12622,9 +12619,6 @@ end
 arch grass
 x 48
 end
-arch lamppost
-x 48
-end
 arch dungeon_magic
 x 48
 y 1
@@ -12648,10 +12642,6 @@ name Pump House
 x 48
 y 2
 end
-arch light2
-x 48
-y 2
-end
 arch dungeon_magic
 x 48
 y 3
@@ -12939,6 +12929,9 @@ end
 arch grass
 x 49
 end
+arch lamppost
+x 49
+end
 arch dungeon_magic
 x 49
 y 1
diff --git a/world/world_105_115 b/world/world_105_115
index 21914b398..983d9d4ca 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 37
 msg
 Created:  2001-02-16
-Modified: 2016-06-25 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_105_114
@@ -316,7 +316,11 @@ arch grass
 y 43
 elevation 6886
 end
-arch tree5
+arch barrack_long
+name Barracks
+slaying /scorn/houses/barracks
+hp 24
+sp 4
 y 43
 end
 arch dungeon_magic
@@ -354,7 +358,11 @@ arch grass
 y 48
 elevation 10145
 end
-arch tree5
+arch barrack_long
+name Mess Hall
+slaying /scorn/houses/messhall
+hp 24
+sp 4
 y 48
 end
 arch dungeon_magic
@@ -749,14 +757,10 @@ arch dungeon_magic
 x 1
 y 43
 end
-arch cobblestones2
-x 1
-y 43
-elevation 8288
-end
-arch tower_tob
+arch grass
 x 1
 y 43
+elevation 6886
 end
 arch dungeon_magic
 x 1
@@ -782,7 +786,6 @@ end
 arch guard_house_1
 x 1
 y 45
-type 0
 end
 arch dungeon_magic
 x 1
@@ -796,7 +799,6 @@ end
 arch guard_house_1
 x 1
 y 46
-type 0
 end
 arch dungeon_magic
 x 1
@@ -814,14 +816,10 @@ arch dungeon_magic
 x 1
 y 48
 end
-arch cobblestones2
-x 1
-y 48
-elevation 8288
-end
-arch tower_tob
+arch grass
 x 1
 y 48
+elevation 10145
 end
 arch dungeon_magic
 x 1
@@ -1215,7 +1213,6 @@ end
 arch guard_house_2
 x 2
 y 45
-type 0
 end
 arch dungeon_magic
 x 2
@@ -1229,7 +1226,6 @@ end
 arch guard_house_2
 x 2
 y 46
-type 0
 end
 arch dungeon_magic
 x 2
@@ -2834,6 +2830,10 @@ arch dungeon_magic
 x 6
 y 32
 end
+arch light1
+x 6
+y 32
+end
 arch grass
 x 6
 y 32
@@ -3723,22 +3723,7 @@ end
 arch grass
 x 8
 y 35
-elevation 2469
-end
-arch house_2
-name Random House
-slaying /!
-msg
-layoutstyle onion
-floorstyle indoor
-wallstyle wooden
-monsterstyle city
-dungeon_level 1
-dungeon_depth 1
-decorstyle furniture
-endmsg
-x 8
-y 35
+elevation 528
 end
 arch dungeon_magic
 x 8
@@ -4148,6 +4133,10 @@ arch dungeon_magic
 x 9
 y 32
 end
+arch light1
+x 9
+y 32
+end
 arch grass
 x 9
 y 32
@@ -4184,10 +4173,6 @@ x 9
 y 35
 elevation 528
 end
-arch house_2
-x 9
-y 35
-end
 arch dungeon_magic
 x 9
 y 36
@@ -4579,6 +4564,10 @@ arch dungeon_magic
 x 10
 y 32
 end
+arch light1
+x 10
+y 32
+end
 arch grass
 x 10
 y 32
@@ -4617,15 +4606,7 @@ end
 arch grass
 x 10
 y 35
-elevation 707
-end
-arch house_small
-name Fun House
-slaying /scorn/houses/maze1
-hp 3
-sp 20
-x 10
-y 35
+elevation 3260
 end
 arch dungeon_magic
 x 10
@@ -4744,7 +4725,22 @@ end
 arch grass
 x 10
 y 45
-elevation 8959
+elevation 2469
+end
+arch house_2
+name Random House
+slaying /!
+msg
+layoutstyle onion
+floorstyle indoor
+wallstyle wooden
+monsterstyle city
+dungeon_level 1
+dungeon_depth 1
+decorstyle furniture
+endmsg
+x 10
+y 45
 end
 arch dungeon_magic
 x 10
@@ -5076,10 +5072,6 @@ x 11
 y 35
 elevation 3260
 end
-arch house_2
-x 11
-y 35
-end
 arch dungeon_magic
 x 11
 y 36
@@ -5163,12 +5155,12 @@ x 11
 y 42
 elevation 12197
 end
-arch grass
+arch cobblestones2
 x 11
 y 42
 end
 arch barrack_long
-name large house
+name Lake House
 slaying /scorn/houses/map.fr.ruin
 hp 1
 sp 19
@@ -5179,16 +5171,7 @@ arch dungeon_magic
 x 11
 y 43
 end
-arch grass
-x 11
-y 43
-elevation 5697
-end
-arch house_small
-name Wizard's Workshop
-slaying /scorn/houses/wizardw
-hp 6
-sp 13
+arch cobblestones2
 x 11
 y 43
 end
@@ -5554,6 +5537,10 @@ arch dungeon_magic
 x 12
 y 35
 end
+arch light1
+x 12
+y 35
+end
 arch grass
 x 12
 y 35
@@ -5941,6 +5928,10 @@ arch dungeon_magic
 x 13
 y 32
 end
+arch light1
+x 13
+y 32
+end
 arch cobblestones2
 x 13
 y 32
@@ -6470,7 +6461,15 @@ end
 arch grass
 x 14
 y 42
-elevation 7850
+elevation 707
+end
+arch house_small
+name Fun House
+slaying /scorn/houses/maze1
+hp 3
+sp 20
+x 14
+y 42
 end
 arch dungeon_magic
 x 14
@@ -6839,6 +6838,10 @@ arch dungeon_magic
 x 15
 y 35
 end
+arch light1
+x 15
+y 35
+end
 arch grass
 x 15
 y 35
@@ -6878,9 +6881,13 @@ end
 arch grass
 x 15
 y 39
-elevation 10124
+elevation 10000
 end
-arch market1
+arch house_small
+name Wizard's Workshop
+slaying /scorn/houses/wizardw
+hp 6
+sp 13
 x 15
 y 39
 end
@@ -6893,11 +6900,6 @@ x 15
 y 40
 elevation 6093
 end
-arch barrack_long
-name large house
-x 15
-y 40
-end
 arch dungeon_magic
 x 15
 y 41
@@ -7274,6 +7276,10 @@ arch dungeon_magic
 x 16
 y 32
 end
+arch light1
+x 16
+y 32
+end
 arch grass
 x 16
 y 32
@@ -7300,6 +7306,10 @@ arch dungeon_magic
 x 16
 y 35
 end
+arch light1
+x 16
+y 35
+end
 arch grass
 x 16
 y 35
@@ -7341,10 +7351,6 @@ x 16
 y 39
 elevation 9163
 end
-arch market3
-x 16
-y 39
-end
 arch dungeon_magic
 x 16
 y 40
@@ -7692,6 +7698,10 @@ arch dungeon_magic
 x 17
 y 32
 end
+arch light1
+x 17
+y 32
+end
 arch grass
 x 17
 y 32
@@ -7728,11 +7738,6 @@ x 17
 y 35
 elevation 4991
 end
-arch woodhouse
-x 17
-y 35
-elevation 596
-end
 arch dungeon_magic
 x 17
 y 36
@@ -8136,19 +8141,17 @@ arch dungeon_magic
 x 18
 y 31
 end
-arch cobblestones2
+arch grass
 x 18
 y 31
-elevation 132
 end
 arch dungeon_magic
 x 18
 y 32
 end
-arch cobblestones2
+arch grass
 x 18
 y 32
-elevation 1560
 end
 arch dungeon_magic
 x 18
@@ -8579,7 +8582,7 @@ arch dungeon_magic
 x 19
 y 32
 end
-arch grass
+arch cobblestones2
 x 19
 y 32
 end
@@ -8616,6 +8619,10 @@ arch grass
 x 19
 y 35
 end
+arch light1
+x 19
+y 35
+end
 arch dungeon_magic
 x 19
 y 36
@@ -8994,10 +9001,9 @@ arch dungeon_magic
 x 20
 y 31
 end
-arch cobblestones2
+arch grass
 x 20
 y 31
-elevation 1352
 end
 arch dungeon_magic
 x 20
@@ -9011,10 +9017,9 @@ arch dungeon_magic
 x 20
 y 33
 end
-arch cobblestones2
+arch grass
 x 20
 y 33
-elevation 4671
 end
 arch dungeon_magic
 x 20
@@ -9511,10 +9516,8 @@ arch guard_house_1
 name Eastern Gate of Scorn
 x 21
 y 37
-type 0
 elevation 5383
 move_block all
-is_floor 1
 end
 arch guard_house_2
 name Eastern Gate of Scorn
@@ -10207,6 +10210,7 @@ y 41
 elevation 1773
 end
 arch farmhouse
+name Terry's Farm
 slaying /scorn/houses/farmhouse
 hp 11
 sp 9
@@ -12877,8 +12881,7 @@ x 33
 y 35
 elevation 46
 end
-arch sign_w
-name Scorn City Limits
+arch cross_sign
 msg
 Santo Dominion - 350 chains north
 Brest - 518 chains south
@@ -12886,7 +12889,6 @@ Navar City - 948 chains east
 endmsg
 x 33
 y 35
-elevation 3176
 end
 arch cobblestones
 x 33
diff --git a/world/world_105_116 b/world/world_105_116
index 3d89ecbce..43b727f58 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: 2016-07-31 Rick Tanner
+Modified: 2017-07-28 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_105_115
@@ -1774,11 +1774,6 @@ arch grass
 x 6
 y 4
 end
-arch house_2
-name Yolanda's House
-x 6
-y 4
-end
 arch grass
 x 6
 y 5
@@ -3239,10 +3234,6 @@ arch grass
 x 11
 y 4
 end
-arch house_small
-x 11
-y 4
-end
 arch hills
 x 11
 y 5