From 5eae5b4fd45d0fd7fd613e936875e248abfce665 Mon Sep 17 00:00:00 2001 From: rjtanner Date: Sat, 29 Nov 2008 06:16:28 +0000 Subject: [PATCH] Replace and phase out the (old) oakdoor graphic with something different git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10770 282e977c-c81d-0410-88c4-b93c2d0d6712 --- navar_city/apartments/apartment | 10 +++++++--- navar_city/city1church1 | 10 +++++++--- navar_city/dragon_hangar/hangar | 16 +++++++++++----- navar_city/jail/jail | 21 +++++++++++++++------ navar_city/light/light1 | 12 +++++++++--- navar_city/magara/houses/earth_house | 4 ++-- navar_city/magara/houses/family_house | 4 ++-- navar_city/magara/houses/kaisas_place | 13 ++++++++++--- navar_city/magara/houses/large_house | 4 ++-- navar_city/magara/houses/museum | 4 ++-- navar_city/slums/Iggys_house | 21 ++++++++++----------- 11 files changed, 77 insertions(+), 42 deletions(-) diff --git a/navar_city/apartments/apartment b/navar_city/apartments/apartment index 58de107d1..9e6a796b6 100644 --- a/navar_city/apartments/apartment +++ b/navar_city/apartments/apartment @@ -8,7 +8,7 @@ enter_x 10 enter_y 14 msg Created: 2005-03-08 -Modified: 2008-10-25 Rick Tanner +Modified: 2008-11-28 Rick Tanner endmsg end arch woodfloor @@ -1676,13 +1676,17 @@ x 10 y 14 type 71 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 48 sp 1 x 10 y 14 end +arch large_hdoor1 +x 10 +y 14 +end arch woodfloor x 11 type 71 @@ -1817,7 +1821,7 @@ x 11 y 14 type 71 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 48 sp 1 diff --git a/navar_city/city1church1 b/navar_city/city1church1 index fade80361..60a4fc7a6 100644 --- a/navar_city/city1church1 +++ b/navar_city/city1church1 @@ -8,7 +8,7 @@ enter_x 8 enter_y 25 msg Created: 1993-11-10 Cater & Wade (john_cater@yahoo.com) -Modified: 2008-09-21 Rick Tanner +Modified: 2008-11-28 Rick Tanner endmsg end arch stonefloor2 @@ -1348,13 +1348,17 @@ arch stonefloor2 x 8 y 25 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 47 sp 14 x 8 y 25 end +arch large_hdoor1 +x 8 +y 25 +end arch stonefloor2 x 9 end @@ -1466,7 +1470,7 @@ arch stonefloor2 x 9 y 25 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 47 sp 14 diff --git a/navar_city/dragon_hangar/hangar b/navar_city/dragon_hangar/hangar index dcf79d0f1..f87351ab2 100644 --- a/navar_city/dragon_hangar/hangar +++ b/navar_city/dragon_hangar/hangar @@ -7,7 +7,7 @@ height 32 enter_x 15 msg Created: 2005-10-18 Gene Alexander -Modified: 2008-10-21 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch magic_banned @@ -4676,12 +4676,15 @@ end arch cobblestones2 x 14 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 29 sp 35 x 14 end +arch large_hdoor1 +x 14 +end arch magic_banned x 14 y 1 @@ -4998,7 +5001,7 @@ end arch cobblestones2 x 15 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 29 sp 35 @@ -5345,12 +5348,15 @@ end arch cobblestones2 x 16 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 29 sp 35 x 16 end +arch large_hdoor1 +x 16 +end arch magic_banned x 16 y 1 @@ -5692,7 +5698,7 @@ end arch cobblestones2 x 17 end -arch oakdoor +arch invis_exit slaying /world/world_121_117 hp 29 sp 35 diff --git a/navar_city/jail/jail b/navar_city/jail/jail index 4055ba34c..8b8092dfd 100644 --- a/navar_city/jail/jail +++ b/navar_city/jail/jail @@ -8,7 +8,7 @@ height 16 enter_y 7 msg Created: 2001-10-17 -Modified: 2008-10-25 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch dungeon_magic @@ -74,36 +74,45 @@ end arch flagstone y 6 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 8 sp 7 y 6 end +arch door_1 +y 6 +end arch dungeon_magic y 7 end arch flagstone y 7 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 8 sp 7 y 7 end +arch door_1 +y 7 +end arch dungeon_magic y 8 end arch flagstone y 8 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 8 sp 7 y 8 end +arch door_1 +y 8 +end arch dungeon_magic y 9 end @@ -1052,11 +1061,11 @@ arch flagstone x 4 y 14 end -arch westcwall_2_1_2 +arch swall_1_2_half x 4 y 14 end -arch swall_1_2_half +arch westcwall_2_1_2 x 4 y 14 end diff --git a/navar_city/light/light1 b/navar_city/light/light1 index 84aa42b35..a8f98e474 100644 --- a/navar_city/light/light1 +++ b/navar_city/light/light1 @@ -9,7 +9,7 @@ enter_x 17 enter_y 4 msg Created: 1993-11-12 -Modified: 2008-10-25 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch cobblestones2 @@ -67,21 +67,27 @@ end arch cobblestones2 y 10 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 18 sp 2 y 10 end +arch door_1 +y 10 +end arch cobblestones2 y 11 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 18 sp 2 y 11 end +arch door_1 +y 11 +end arch cobblestones2 y 12 end diff --git a/navar_city/magara/houses/earth_house b/navar_city/magara/houses/earth_house index 4efaa7efc..6ee88793e 100644 --- a/navar_city/magara/houses/earth_house +++ b/navar_city/magara/houses/earth_house @@ -8,7 +8,7 @@ enter_x 1 enter_y 1 msg Created: 1994-10-11 -Modified: 2008-10-21 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch dirtfloor @@ -127,7 +127,7 @@ arch dirtfloor x 1 y 1 end -arch oakdoor +arch ladder_bi_up slaying /world/world_121_117 hp 46 sp 0 diff --git a/navar_city/magara/houses/family_house b/navar_city/magara/houses/family_house index 7ab36866f..71e020ca6 100644 --- a/navar_city/magara/houses/family_house +++ b/navar_city/magara/houses/family_house @@ -8,7 +8,7 @@ enter_x 1 enter_y 1 msg Created: 2001-03-31 -Modified: 2008-09-20 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch gwall_2_2_2 @@ -92,7 +92,7 @@ arch dungeon_floor x 1 y 1 end -arch oakdoor +arch ladder_bi_up slaying /world/world_121_117 hp 46 sp 1 diff --git a/navar_city/magara/houses/kaisas_place b/navar_city/magara/houses/kaisas_place index bb06afced..cef2374f8 100644 --- a/navar_city/magara/houses/kaisas_place +++ b/navar_city/magara/houses/kaisas_place @@ -7,7 +7,7 @@ height 17 enter_y 3 msg Created: 1994-10-11 -Modified: 2008-09-20 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch stonefloor2 @@ -33,12 +33,15 @@ arch stonefloor2 name stonefloor y 3 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 0 sp 2 y 3 end +arch door_1 +y 3 +end arch stonefloor2 name stonefloor y 4 @@ -8838,13 +8841,17 @@ name stonefloor x 79 y 3 end -arch oakdoor +arch invis_exit slaying /world/world_122_117 hp 0 sp 2 x 79 y 3 end +arch door_1 +x 79 +y 3 +end arch stonefloor2 name stonefloor x 79 diff --git a/navar_city/magara/houses/large_house b/navar_city/magara/houses/large_house index cbfad94cf..bc03cfcc3 100644 --- a/navar_city/magara/houses/large_house +++ b/navar_city/magara/houses/large_house @@ -8,7 +8,7 @@ enter_x 1 enter_y 1 msg Created: 1994-10-11 -Modified: 2008-09-20 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch small_stones @@ -319,7 +319,7 @@ arch small_stones x 1 y 1 end -arch oakdoor +arch exit slaying /world/world_122_117 hp 12 sp 14 diff --git a/navar_city/magara/houses/museum b/navar_city/magara/houses/museum index 6c36422b3..090ffbacb 100644 --- a/navar_city/magara/houses/museum +++ b/navar_city/magara/houses/museum @@ -8,7 +8,7 @@ enter_x 4 enter_y 18 msg Created: 1994-10-11 -Modified: 2008-09-20 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch flagstone @@ -1379,7 +1379,7 @@ arch dungeon_magic x 4 y 18 end -arch oakdoor +arch exit slaying /world/world_122_117 hp 5 sp 7 diff --git a/navar_city/slums/Iggys_house b/navar_city/slums/Iggys_house index 8dccef5b5..3e834d970 100644 --- a/navar_city/slums/Iggys_house +++ b/navar_city/slums/Iggys_house @@ -8,7 +8,7 @@ enter_x 1 enter_y 15 msg Created: 2004-01-12 Avion -Modified: 2008-10-25 Rick Tanner +Modified: 2008-11-29 Rick Tanner endmsg end arch woodfloor @@ -96,19 +96,25 @@ end arch woodfloor y 14 end -arch wall_3_2 +arch wall_2_2_1 y 14 end arch woodfloor y 15 end -arch wall_2_1_1 +arch invis_exit +slaying /world/world_121_117 +hp 46 +sp 8 +y 15 +end +arch door_1 y 15 end arch woodfloor y 16 end -arch wall_3_2 +arch wall_2_2_2 y 16 end arch woodfloor @@ -279,13 +285,6 @@ arch woodfloor x 1 y 15 end -arch oakdoor -slaying /world/world_121_117 -hp 46 -sp 8 -x 1 -y 15 -end arch woodfloor x 1 y 16