From 61b435d5a29b4af546b971f7178337f2ff798638 Mon Sep 17 00:00:00 2001
From: rjtanner <rjtanner@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Thu, 13 Oct 2011 04:47:00 +0000
Subject: [PATCH] Cosmetic update to Church to Valriel in Marksel. Added outer
 perimeter to the original map to match the building exterior. Rearanged the
 floor plan to match building exterior. Map considered an outdoor map so
 darkness or time of day is visible when inside; additional light sources were
 added. Updated entrance/exit coordinates in world map back to the church.

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@15180 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 marksel/church      | 1027 +++++++++++++++++++++++++++++++------------
 world/world_120_109 |    4 +-
 2 files changed, 743 insertions(+), 288 deletions(-)

diff --git a/marksel/church b/marksel/church
index 71c91513e..8eb88e921 100644
--- a/marksel/church
+++ b/marksel/church
@@ -2,243 +2,467 @@ arch map
 name Church to Valriel
 difficulty 8
 region marksel
-width 7
-height 11
+width 11
+height 15
 enter_x 3
 enter_y 10
 msg
 Created:  1999-02-03 King Zoobus
-Modified: 2008-12-01 Rick Tanner
+Modified: 2011-10-12 Rick Tanner
 endmsg
+outdoor 1
 end
-arch cobblestones2
+arch grass_only
 end
-arch cobblestones2
+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
+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 2
+end
+arch grass_only
+x 2
+y 1
+end
+arch grass_only
+x 2
+y 2
+end
+arch cobblestones2
+x 2
+y 3
+end
 arch dwall_2_2_2
-y 1
-end
-arch cobblestones2
-y 2
-end
-arch dwall_2_1_1
-y 2
-end
-arch cobblestones2
-y 3
-end
-arch dwall_2_1_1
+x 2
 y 3
 end
 arch cobblestones2
+x 2
 y 4
 end
 arch dwall_2_1_1
+x 2
 y 4
 end
-arch cobblestones2
-y 5
-end
-arch dwall_2_1_1
+arch light2
+x 2
 y 5
 end
 arch cobblestones2
+x 2
+y 5
+end
+arch dwall_win1
+x 2
+y 5
+end
+arch cobblestones2
+x 2
 y 6
 end
 arch dwall_2_1_1
+x 2
 y 6
 end
 arch cobblestones2
+x 2
 y 7
 end
 arch dwall_2_1_1
+x 2
 y 7
 end
-arch cobblestones2
-y 8
-end
-arch dwall_2_1_1
+arch light2
+x 2
 y 8
 end
 arch cobblestones2
+x 2
+y 8
+end
+arch dwall_win1
+x 2
+y 8
+end
+arch cobblestones2
+x 2
 y 9
 end
 arch dwall_2_1_1
+x 2
 y 9
 end
 arch cobblestones2
+x 2
 y 10
 end
+arch dwall_2_1_1
+x 2
+y 10
+end
+arch cobblestones2
+x 2
+y 11
+end
+arch dwall_2_1_1
+x 2
+y 11
+end
+arch cobblestones2
+x 2
+y 12
+end
 arch dwall_2_2_1
-y 10
+x 2
+y 12
 end
-arch cobblestones2
-x 1
+arch grass_only
+x 2
+y 13
+end
+arch grass_only
+x 2
+y 14
+end
+arch grass_only
+x 3
+end
+arch grass_only
+x 3
+y 1
+end
+arch grass_only
+x 3
+y 2
 end
 arch tree5
-x 1
-end
-arch cobblestones2
-x 1
-y 1
-end
-arch dwall_2_1_2
-x 1
-y 1
-end
-arch cobblestones2
-x 1
+x 3
 y 2
 end
+arch light2
+x 3
+y 3
+end
+arch cobblestones2
+x 3
+y 3
+end
+arch dwall_win2
+x 3
+y 3
+end
+arch cobblestones2
+x 3
+y 4
+end
 arch holy_symbol
-x 1
-y 2
-end
-arch cobblestones2
-x 1
-y 3
-end
-arch cobblestones2
-x 1
-y 4
-end
-arch torch_1
-x 1
+x 3
 y 4
 end
 arch cobblestones2
-x 1
+x 3
 y 5
 end
 arch cobblestones2
-x 1
+x 3
+y 6
+end
+arch torch_1
+x 3
 y 6
 end
 arch cobblestones2
-x 1
-y 7
-end
-arch torch_1
-x 1
+x 3
 y 7
 end
 arch cobblestones2
-x 1
+x 3
 y 8
 end
+arch cobblestones2
+x 3
+y 9
+end
+arch torch_1
+x 3
+y 9
+end
+arch cobblestones2
+x 3
+y 10
+end
 arch gravestone2
-x 1
-y 8
-end
-arch cobblestones2
-x 1
-y 9
-end
-arch cobblestones2
-x 1
-y 10
-end
-arch dwall_2_1_2
-x 1
+x 3
 y 10
 end
 arch cobblestones2
-x 2
+x 3
+y 11
+end
+arch light2
+x 3
+y 12
+end
+arch cobblestones2
+x 3
+y 12
+end
+arch dwall_win2
+x 3
+y 12
+end
+arch grass_only
+x 3
+y 13
+end
+arch grass_only
+x 3
+y 14
+end
+arch grass_only
+x 4
+end
+arch grass_only
+x 4
+y 1
+end
+arch cobblestones2
+x 4
+y 2
 end
 arch dwall_2_2_2
-x 2
+x 4
+y 2
 end
 arch cobblestones2
-x 2
-y 1
+x 4
+y 3
 end
 arch dwall_2_2_4
-x 2
-y 1
-end
-arch cobblestones2
-x 2
-y 2
-end
-arch flowers_permanent
-x 2
-y 2
+x 4
+y 3
 end
 arch dungeon_magic
-x 2
-y 2
-end
-arch cobblestones2
-x 2
-y 3
-end
-arch bench_1_4
-x 2
-y 3
-end
-arch cobblestones2
-x 2
+x 4
 y 4
 end
 arch cobblestones2
-x 2
+x 4
+y 4
+end
+arch flowers_permanent
+x 4
+y 4
+end
+arch cobblestones2
+x 4
 y 5
 end
 arch bench_1_4
-x 2
+x 4
 y 5
 end
 arch cobblestones2
-x 2
+x 4
 y 6
 end
 arch cobblestones2
-x 2
+x 4
 y 7
 end
 arch bench_1_4
-x 2
+x 4
 y 7
 end
 arch cobblestones2
-x 2
+x 4
 y 8
 end
 arch cobblestones2
-x 2
+x 4
+y 9
+end
+arch bench_1_4
+x 4
 y 9
 end
 arch cobblestones2
-x 2
+x 4
 y 10
 end
+arch light3
+x 4
+y 11
+end
+arch button_small
+x 4
+y 11
+connected 1
+end
+arch cobblestones2
+x 4
+y 11
+end
+arch cobblestones2
+x 4
+y 12
+end
 arch dwall_1_3
-x 2
-y 10
-end
-arch cobblestones2
-x 3
-end
-arch dwall_2_1_2
-x 3
+x 4
+y 12
 end
 arch dungeon_magic
-x 3
+x 4
+y 13
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 44
+sp 43
+x 4
+y 13
+end
+arch grass_only
+x 4
+y 13
+end
+arch grass_only
+x 4
+y 14
+end
+arch grass_only
+x 5
+end
+arch grass_only
+x 5
 y 1
 end
 arch cobblestones2
-x 3
-y 1
+x 5
+y 2
+end
+arch dwall_2_1_2
+x 5
+y 2
+end
+arch light2
+x 5
+y 3
+end
+arch dungeon_magic
+x 5
+y 3
+end
+arch cobblestones2
+x 5
+y 3
 end
 arch altar_valriel
-x 3
-y 1
+x 5
+y 3
 level 120
 end
 arch cobblestones2
-x 3
-y 2
+x 5
+y 4
 end
 arch holy_priest
 msg
@@ -253,8 +477,8 @@ You have come a long way, stranger. I
 feel this must be an omen. You must
 visit the high priest in Darcap.
 endmsg
-x 3
-y 2
+x 5
+y 4
 carrying 31802
 arch key2
 name church key
@@ -303,123 +527,159 @@ end
 arch robe
 end
 end
-arch cobblestones2
-x 3
-y 3
-end
-arch bench_2_1_2
-x 3
-y 3
-end
 arch dungeon_magic
-x 3
-y 3
+x 5
+y 5
 end
 arch cobblestones2
-x 3
-y 4
-end
-arch cobblestones2
-x 3
+x 5
 y 5
 end
 arch bench_2_1_2
-x 3
+x 5
 y 5
 end
 arch cobblestones2
-x 3
+x 5
 y 6
 end
 arch cobblestones2
-x 3
+x 5
 y 7
 end
 arch bench_2_1_2
-x 3
+x 5
 y 7
 end
 arch cobblestones2
-x 3
+x 5
 y 8
 end
 arch cobblestones2
-x 3
+x 5
+y 9
+end
+arch bench_2_1_2
+x 5
 y 9
 end
 arch cobblestones2
-x 3
+x 5
 y 10
 end
-arch oakdoor_2
+arch button_small
+x 5
+y 11
+connected 1
+end
+arch cobblestones2
+x 5
+y 11
+end
+arch button_small
+x 5
+y 12
+connected 1
+end
+arch cobblestones2
+x 5
+y 12
+end
+arch odoorn2_closed_1
+x 5
+y 12
+connected 1
+end
+arch dungeon_magic
+x 5
+y 13
+end
+arch invis_exit
 slaying /world/world_120_109
 hp 44
 sp 43
-x 3
-y 10
+x 5
+y 13
+end
+arch grass_only
+x 5
+y 13
+end
+arch grass_only
+x 5
+y 14
+end
+arch grass_only
+x 6
+end
+arch grass_only
+x 6
+y 1
 end
 arch cobblestones2
-x 4
+x 6
+y 2
 end
 arch dwall_2_2_3
-x 4
+x 6
+y 2
 end
 arch cobblestones2
-x 4
-y 1
+x 6
+y 3
 end
 arch dwall_2_2_1
-x 4
-y 1
-end
-arch cobblestones2
-x 4
-y 2
-end
-arch rose_red
-x 4
-y 2
+x 6
+y 3
 end
 arch dungeon_magic
-x 4
-y 2
-end
-arch cobblestones2
-x 4
-y 3
-end
-arch bench_1_3
-x 4
-y 3
-end
-arch cobblestones2
-x 4
+x 6
 y 4
 end
 arch cobblestones2
-x 4
+x 6
+y 4
+end
+arch rose_red
+x 6
+y 4
+end
+arch cobblestones2
+x 6
 y 5
 end
 arch bench_1_3
-x 4
+x 6
 y 5
 end
 arch cobblestones2
-x 4
+x 6
 y 6
 end
 arch cobblestones2
-x 4
+x 6
 y 7
 end
 arch bench_1_3
-x 4
+x 6
 y 7
 end
 arch cobblestones2
-x 4
+x 6
 y 8
 end
+arch cobblestones2
+x 6
+y 9
+end
+arch bench_1_3
+x 6
+y 9
+end
+arch cobblestones2
+x 6
+y 10
+end
 arch northman
 name warrior
 msg
@@ -428,8 +688,8 @@ I have come a long way to have my
 child baptised.
 endmsg
 hp 250
-x 4
-y 8
+x 6
+y 10
 carrying 113000
 unaggressive 1
 arch broadsword_2
@@ -443,40 +703,81 @@ end
 arch high_boots
 end
 end
-arch cobblestones2
-x 4
-y 9
+arch light3
+x 6
+y 11
+end
+arch button_small
+x 6
+y 11
+connected 1
 end
 arch cobblestones2
-x 4
-y 10
+x 6
+y 11
+end
+arch cobblestones2
+x 6
+y 12
 end
 arch dwall_1_4
-x 4
-y 10
+x 6
+y 12
 end
-arch cobblestones2
-x 5
+arch dungeon_magic
+x 6
+y 13
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 44
+sp 43
+x 6
+y 13
+end
+arch grass_only
+x 6
+y 13
+end
+arch grass_only
+x 6
+y 14
+end
+arch grass_only
+x 7
+end
+arch grass_only
+x 7
+y 1
+end
+arch grass_only
+x 7
+y 2
 end
 arch tree5
-x 5
-end
-arch cobblestones2
-x 5
-y 1
-end
-arch dwall_2_1_2
-x 5
-y 1
-end
-arch cobblestones2
-x 5
+x 7
 y 2
 end
+arch light2
+x 7
+y 3
+end
+arch cobblestones2
+x 7
+y 3
+end
+arch dwall_win2
+x 7
+y 3
+end
+arch cobblestones2
+x 7
+y 4
+end
 arch depositbox
 slaying 4
-x 5
-y 2
+x 7
+y 4
 carrying 37200
 arch random_wealth
 end
@@ -493,49 +794,49 @@ arch chalice
 end
 end
 arch cobblestones2
-x 5
-y 3
-end
-arch cobblestones2
-x 5
-y 4
-end
-arch torch_1
-x 5
-y 4
-end
-arch cobblestones2
-x 5
+x 7
 y 5
 end
 arch cobblestones2
-x 5
+x 7
+y 6
+end
+arch torch_1
+x 7
 y 6
 end
 arch cobblestones2
-x 5
-y 7
-end
-arch torch_1
-x 5
+x 7
 y 7
 end
 arch cobblestones2
-x 5
+x 7
 y 8
 end
+arch cobblestones2
+x 7
+y 9
+end
+arch torch_1
+x 7
+y 9
+end
+arch cobblestones2
+x 7
+y 10
+end
 arch fountain
-x 5
-y 8
+x 7
+y 10
 end
 arch child
-x 5
-y 8
+x 7
+y 10
 stand_still 1
 end
 arch cobblestones2
-x 5
-y 9
+x 7
+y 11
 end
 arch a_priest
 msg
@@ -544,8 +845,8 @@ Bless this child, o Lord, so that he
 may live in honor
 endmsg
 hp 150
-x 5
-y 9
+x 7
+y 11
 carrying 13900
 arch wand
 randomitems none
@@ -563,94 +864,248 @@ end
 arch random_scroll
 end
 end
-arch cobblestones2
-x 5
-y 10
-end
-arch dwall_2_1_2
-x 5
-y 10
+arch light2
+x 7
+y 12
 end
 arch cobblestones2
-x 6
+x 7
+y 12
 end
-arch cobblestones2
-x 6
+arch dwall_win2
+x 7
+y 12
+end
+arch grass_only
+x 7
+y 13
+end
+arch grass_only
+x 7
+y 14
+end
+arch grass_only
+x 8
+end
+arch grass_only
+x 8
 y 1
 end
+arch grass_only
+x 8
+y 2
+end
+arch cobblestones2
+x 8
+y 3
+end
 arch dwall_2_2_3
-x 6
-y 1
-end
-arch cobblestones2
-x 6
-y 2
-end
-arch dwall_2_1_1
-x 6
-y 2
-end
-arch cobblestones2
-x 6
-y 3
-end
-arch dwall_2_1_1
-x 6
+x 8
 y 3
 end
 arch cobblestones2
-x 6
+x 8
 y 4
 end
 arch dwall_2_1_1
-x 6
+x 8
 y 4
 end
-arch cobblestones2
-x 6
-y 5
-end
-arch dwall_2_1_1
-x 6
+arch light2
+x 8
 y 5
 end
 arch cobblestones2
-x 6
+x 8
+y 5
+end
+arch dwall_win1
+x 8
+y 5
+end
+arch cobblestones2
+x 8
 y 6
 end
 arch dwall_2_1_1
-x 6
+x 8
 y 6
 end
 arch cobblestones2
-x 6
+x 8
 y 7
 end
 arch dwall_2_1_1
-x 6
+x 8
 y 7
 end
-arch cobblestones2
-x 6
-y 8
-end
-arch dwall_2_1_1
-x 6
+arch light2
+x 8
 y 8
 end
 arch cobblestones2
-x 6
+x 8
+y 8
+end
+arch dwall_win1
+x 8
+y 8
+end
+arch cobblestones2
+x 8
 y 9
 end
 arch dwall_2_1_1
-x 6
+x 8
 y 9
 end
 arch cobblestones2
-x 6
+x 8
 y 10
 end
+arch dwall_2_1_1
+x 8
+y 10
+end
+arch cobblestones2
+x 8
+y 11
+end
+arch dwall_2_1_1
+x 8
+y 11
+end
+arch cobblestones2
+x 8
+y 12
+end
 arch dwall_2_2_4
-x 6
+x 8
+y 12
+end
+arch grass_only
+x 8
+y 13
+end
+arch grass_only
+x 8
+y 14
+end
+arch grass_only
+x 9
+end
+arch grass_only
+x 9
+y 1
+end
+arch grass_only
+x 9
+y 2
+end
+arch grass_only
+x 9
+y 3
+end
+arch grass_only
+x 9
+y 4
+end
+arch grass_only
+x 9
+y 5
+end
+arch grass_only
+x 9
+y 6
+end
+arch grass_only
+x 9
+y 7
+end
+arch grass_only
+x 9
+y 8
+end
+arch grass_only
+x 9
+y 9
+end
+arch grass_only
+x 9
 y 10
 end
+arch grass_only
+x 9
+y 11
+end
+arch grass_only
+x 9
+y 12
+end
+arch grass_only
+x 9
+y 13
+end
+arch grass_only
+x 9
+y 14
+end
+arch grass_only
+x 10
+end
+arch grass_only
+x 10
+y 1
+end
+arch grass_only
+x 10
+y 2
+end
+arch grass_only
+x 10
+y 3
+end
+arch grass_only
+x 10
+y 4
+end
+arch grass_only
+x 10
+y 5
+end
+arch grass_only
+x 10
+y 6
+end
+arch grass_only
+x 10
+y 7
+end
+arch grass_only
+x 10
+y 8
+end
+arch grass_only
+x 10
+y 9
+end
+arch grass_only
+x 10
+y 10
+end
+arch grass_only
+x 10
+y 11
+end
+arch grass_only
+x 10
+y 12
+end
+arch grass_only
+x 10
+y 13
+end
+arch grass_only
+x 10
+y 14
+end
diff --git a/world/world_120_109 b/world/world_120_109
index 610eb852e..cd55afcfe 100644
--- a/world/world_120_109
+++ b/world/world_120_109
@@ -4,7 +4,7 @@ region marksel
 width 50
 height 50
 msg
-Modified: 2011-04-23 Rick Tanner
+Modified: 2011-10-12 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_120_108
@@ -11599,7 +11599,7 @@ end
 arch shrine
 name Church to Valriel
 slaying /marksel/church
-hp 3
+hp 5
 sp 10
 x 44
 y 43