From c7b29bb42d6fdc1e2a9a977c30cfdbc3f0f69a8d Mon Sep 17 00:00:00 2001 From: rjtanner Date: Tue, 2 Dec 2008 01:49:04 +0000 Subject: [PATCH] Replace recently updated oakdoors with new archetype and recycled graphic. Requires archetype r10798 or newer. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10799 282e977c-c81d-0410-88c4-b93c2d0d6712 --- brest/asyvan/palace1 | 8 ++--- brest/brest.IPO | 17 ++++------- brest/brest.armour | 5 +-- brest/brest.cvt | 9 ++---- brest/brest.food | 9 ++---- brest/brest.magic | 9 ++---- brest/brest.trademarket | 32 +++++++------------- brest/brest.weapon | 9 ++---- brest/brittany/dol-guldur.1 | 57 +++++++---------------------------- brest/brittany/dol-guldur.2 | 8 ++--- brest/brittany/dol-guldur.3 | 32 ++++---------------- brest/brittany/dol-guldur.4 | 14 ++------- brest/brittany/dol-guldur.5 | 14 ++------- brest/brittany/dol-guldur.6 | 20 +++--------- brest/brittany/jessy.1 | 8 ++--- brest/brittany/tower_of__zoon | 7 ++--- brest/elec.jes | 9 ++---- brest/jes.admini | 8 ++++- brest/pshops/pshop1/gfloor | 8 ++--- brest/pshops/pshop10/gfloor | 8 ++--- brest/pshops/pshop11/gfloor | 8 ++--- brest/pshops/pshop12/gfloor | 8 ++--- brest/pshops/pshop13/gfloor | 8 ++--- brest/pshops/pshop14/gfloor | 8 ++--- brest/pshops/pshop15/gfloor | 8 ++--- brest/pshops/pshop16/gfloor | 8 ++--- brest/pshops/pshop17/gfloor | 8 ++--- brest/pshops/pshop18/gfloor | 8 ++--- brest/pshops/pshop19/gfloor | 8 ++--- brest/pshops/pshop2/gfloor | 8 ++--- brest/pshops/pshop20/gfloor | 8 ++--- brest/pshops/pshop21/gfloor | 8 ++--- brest/pshops/pshop22/gfloor | 8 ++--- brest/pshops/pshop23/gfloor | 8 ++--- brest/pshops/pshop24/gfloor | 8 ++--- brest/pshops/pshop25/gfloor | 8 ++--- brest/pshops/pshop26/gfloor | 8 ++--- brest/pshops/pshop27/gfloor | 8 ++--- brest/pshops/pshop3/gfloor | 8 ++--- brest/pshops/pshop4/gfloor | 8 ++--- brest/pshops/pshop5/gfloor | 8 ++--- brest/pshops/pshop6/gfloor | 8 ++--- brest/pshops/pshop7/gfloor | 8 ++--- brest/pshops/pshop8/gfloor | 8 ++--- brest/pshops/pshop9/gfloor | 8 ++--- brest/pshops/pshopsinc | 8 ++--- brest/shops/buildshop | 8 ++--- 47 files changed, 135 insertions(+), 372 deletions(-) diff --git a/brest/asyvan/palace1 b/brest/asyvan/palace1 index 99c433e90..bbbb19f2d 100644 --- a/brest/asyvan/palace1 +++ b/brest/asyvan/palace1 @@ -8,7 +8,7 @@ enter_x 8 enter_y 15 msg Created: 1994-09-20 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dungeon_magic @@ -1459,17 +1459,13 @@ arch afloor_left x 8 y 16 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_123 hp 32 sp 25 x 8 y 16 end -arch odoor_2_fant_brown -x 8 -y 16 -end arch dungeon_magic x 9 end diff --git a/brest/brest.IPO b/brest/brest.IPO index 84566f8c1..2fd871238 100644 --- a/brest/brest.IPO +++ b/brest/brest.IPO @@ -8,7 +8,7 @@ enter_x 5 enter_y 8 msg Created: 2001-09-05 Commander Gros (yann.chachkoff@mailandnews.com) -Modified: 2008-10-24 Rick Tanner +Modified: 2008-12-01 Rick Tanner Following a Lord MiDS idea endmsg end @@ -392,7 +392,11 @@ arch woodfloor x 5 y 8 end -arch invis_exit +arch woodfloor +x 5 +y 9 +end +arch oakdoor_2 slaying /world/world_107_123 hp 35 sp 29 @@ -400,15 +404,6 @@ x 5 y 9 end arch woodfloor -x 5 -y 9 -end -arch door_2 -x 5 -y 9 -move_block 0 -end -arch woodfloor x 6 end arch woodwall_2_1_2 diff --git a/brest/brest.armour b/brest/brest.armour index 7c009372d..1be022f85 100644 --- a/brest/brest.armour +++ b/brest/brest.armour @@ -12,7 +12,7 @@ height 20 enter_x 9 enter_y 19 msg -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch shop_empty @@ -940,8 +940,9 @@ arch woodfloor x 9 y 19 end -arch odoor_2_fant_blue-yellow +arch oakdoor_2 slaying /world/world_107_123 +face odoor_2_fant_blue-yellow.111 hp 30 sp 41 x 9 diff --git a/brest/brest.cvt b/brest/brest.cvt index 5c1b5e46f..2ceab690b 100644 --- a/brest/brest.cvt +++ b/brest/brest.cvt @@ -13,7 +13,7 @@ enter_x 9 enter_y 19 msg What an odd map. -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -1119,17 +1119,14 @@ arch woodfloor x 9 y 19 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_123 +face odoor_2_fant_brown.111 hp 36 sp 39 x 9 y 19 end -arch odoor_2_fant_brown -x 9 -y 19 -end arch shop_empty x 10 end diff --git a/brest/brest.food b/brest/brest.food index c00fa5e55..1dcc6b55a 100644 --- a/brest/brest.food +++ b/brest/brest.food @@ -13,7 +13,7 @@ enter_x 9 enter_y 19 msg Created: 1994-05-31 -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch shop_empty @@ -936,17 +936,14 @@ arch woodfloor x 9 y 19 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_123 +face odoor_2_fant_brown.111 hp 28 sp 38 x 9 y 19 end -arch odoor_2_fant_brown -x 9 -y 19 -end arch shop_empty x 10 end diff --git a/brest/brest.magic b/brest/brest.magic index fd5bef3ee..94be4718e 100644 --- a/brest/brest.magic +++ b/brest/brest.magic @@ -13,7 +13,7 @@ enter_x 6 enter_y 11 msg Created: 1994-07-25 -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch shop_empty @@ -452,17 +452,14 @@ arch woodfloor x 6 y 12 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_123 +face odoor_2_fant_brown.111 hp 33 sp 40 x 6 y 12 end -arch odoor_2_fant_brown -x 6 -y 12 -end arch shop_empty x 7 end diff --git a/brest/brest.trademarket b/brest/brest.trademarket index 4c6228987..c333f6be3 100644 --- a/brest/brest.trademarket +++ b/brest/brest.trademarket @@ -9,7 +9,7 @@ enter_x 7 enter_y 15 msg Created: 2004-08-03 Mikeeusa -Modified: 2008-09-11 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dungeon_magic @@ -1530,22 +1530,17 @@ arch dungeon_magic x 6 y 16 end -arch invis_exit +arch woodfloor +x 6 +y 16 +end +arch oakdoor_2 slaying /world/world_107_123 hp 36 sp 29 x 6 y 16 end -arch woodfloor -x 6 -y 16 -end -arch door_2 -x 6 -y 16 -move_block 0 -end arch dungeon_magic x 6 y 17 @@ -1749,22 +1744,17 @@ arch dungeon_magic x 7 y 16 end -arch invis_exit +arch woodfloor +x 7 +y 16 +end +arch oakdoor_2 slaying /world/world_107_123 hp 36 sp 29 x 7 y 16 end -arch woodfloor -x 7 -y 16 -end -arch door_2 -x 7 -y 16 -move_block 0 -end arch dungeon_magic x 7 y 17 diff --git a/brest/brest.weapon b/brest/brest.weapon index c621d8db0..48a0c4638 100644 --- a/brest/brest.weapon +++ b/brest/brest.weapon @@ -11,7 +11,7 @@ height 20 enter_x 9 enter_y 18 msg -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch shop_empty @@ -939,12 +939,9 @@ arch woodfloor x 9 y 19 end -arch woodfloor -x 9 -y 19 -end -arch odoor_2_fant_blue-green +arch oakdoor_2 slaying /world/world_107_123 +face odoor_2_fant_blue-green.111 hp 31 sp 37 x 9 diff --git a/brest/brittany/dol-guldur.1 b/brest/brittany/dol-guldur.1 index bbf39fdc4..ec7f7fd87 100644 --- a/brest/brittany/dol-guldur.1 +++ b/brest/brittany/dol-guldur.1 @@ -5,7 +5,7 @@ width 7 height 29 msg Created: 1994-06-01 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dungeon_floor @@ -69,15 +69,12 @@ end arch dungeon_floor y 10 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.2 hp 24 sp 10 y 10 end -arch door_1 -y 10 -end arch dungeon_floor y 11 end @@ -99,15 +96,12 @@ end arch dungeon_floor y 14 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.3 hp 25 sp 2 y 14 end -arch door_1 -y 14 -end arch dungeon_floor y 15 end @@ -129,15 +123,12 @@ end arch dungeon_floor y 18 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.3 hp 25 sp 6 y 18 end -arch door_1 -y 18 -end arch dungeon_floor y 19 end @@ -159,15 +150,12 @@ end arch dungeon_floor y 22 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.3 hp 25 sp 10 y 22 end -arch door_1 -y 22 -end arch dungeon_floor y 23 end @@ -568,15 +556,12 @@ end arch dungeon_floor x 3 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_124 hp 9 sp 21 x 3 end -arch door_2 -x 3 -end arch dungeon_floor x 3 y 1 @@ -706,17 +691,13 @@ arch dungeon_floor x 3 y 28 end -arch invis_exit +arch oakdoor_2 slaying dol-guldur.6 hp 2 sp 9 x 3 y 28 end -arch door_2 -x 3 -y 28 -end arch dungeon_floor x 4 end @@ -1167,17 +1148,13 @@ arch dungeon_floor x 6 y 12 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.5 hp 1 sp 12 x 6 y 12 end -arch door_1 -x 6 -y 12 -end arch dungeon_floor x 6 y 13 @@ -1206,17 +1183,13 @@ arch dungeon_floor x 6 y 16 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.5 hp 1 sp 16 x 6 y 16 end -arch door_1 -x 6 -y 16 -end arch dungeon_floor x 6 y 17 @@ -1245,17 +1218,13 @@ arch dungeon_floor x 6 y 20 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.6 hp 4 sp 2 x 6 y 20 end -arch door_1 -x 6 -y 20 -end arch dungeon_floor x 6 y 21 @@ -1284,17 +1253,13 @@ arch dungeon_floor x 6 y 24 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.6 hp 4 sp 6 x 6 y 24 end -arch door_1 -x 6 -y 24 -end arch dungeon_floor x 6 y 25 diff --git a/brest/brittany/dol-guldur.2 b/brest/brittany/dol-guldur.2 index 4e0fb996d..0abd29d20 100644 --- a/brest/brittany/dol-guldur.2 +++ b/brest/brittany/dol-guldur.2 @@ -5,7 +5,7 @@ width 26 height 15 msg Created: 1994-06-02 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch pstone_1 @@ -2732,17 +2732,13 @@ arch dungeon_floor x 25 y 10 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 1 sp 10 x 25 y 10 end -arch door_1 -x 25 -y 10 -end arch pstone_1 x 25 y 11 diff --git a/brest/brittany/dol-guldur.3 b/brest/brittany/dol-guldur.3 index f405899b7..e12998ab6 100644 --- a/brest/brittany/dol-guldur.3 +++ b/brest/brittany/dol-guldur.3 @@ -5,7 +5,7 @@ width 27 height 32 msg Created: 1994-06-02 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dirtfloor @@ -828,17 +828,13 @@ arch dirtfloor x 3 y 29 end -arch exit +arch oakdoor_2 slaying dol-guldur.4 hp 4 sp 1 x 3 y 29 end -arch door_look_1 -x 3 -y 29 -end arch dirtfloor x 3 y 30 @@ -1057,17 +1053,13 @@ arch dirtfloor x 4 y 29 end -arch exit +arch oakdoor_2 slaying dol-guldur.4 hp 4 sp 1 x 4 y 29 end -arch door_look_1 -x 4 -y 29 -end arch dirtfloor x 4 y 30 @@ -5794,17 +5786,13 @@ arch dungeon_floor x 26 y 2 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 1 sp 14 x 26 y 2 end -arch door_1 -x 26 -y 2 -end arch dirtfloor x 26 y 3 @@ -5833,17 +5821,13 @@ arch dungeon_floor x 26 y 6 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 1 sp 18 x 26 y 6 end -arch door_1 -x 26 -y 6 -end arch dirtfloor x 26 y 7 @@ -5872,17 +5856,13 @@ arch dungeon_floor x 26 y 10 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 1 sp 22 x 26 y 10 end -arch door_1 -x 26 -y 10 -end arch dungeon_floor x 26 y 11 diff --git a/brest/brittany/dol-guldur.4 b/brest/brittany/dol-guldur.4 index 848b24e1e..46ae63022 100644 --- a/brest/brittany/dol-guldur.4 +++ b/brest/brittany/dol-guldur.4 @@ -5,7 +5,7 @@ width 24 height 20 msg Created: 1994-06-02 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dirtfloor @@ -451,17 +451,13 @@ arch dirtfloor x 3 y 1 end -arch invis_exit +arch oakdoor_2 slaying dol-guldur.3 hp 3 sp 29 x 3 y 1 end -arch door_look_1 -x 3 -y 1 -end arch dirtfloor x 3 y 2 @@ -616,17 +612,13 @@ arch dirtfloor x 4 y 1 end -arch invis_exit +arch oakdoor_2 slaying dol-guldur.3 hp 4 sp 29 x 4 y 1 end -arch door_look_1 -x 4 -y 1 -end arch dirtfloor x 4 y 2 diff --git a/brest/brittany/dol-guldur.5 b/brest/brittany/dol-guldur.5 index d26c223e2..923b882d0 100644 --- a/brest/brittany/dol-guldur.5 +++ b/brest/brittany/dol-guldur.5 @@ -5,7 +5,7 @@ width 32 height 19 msg Created: 1994-06-02 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dungeon_floor @@ -218,17 +218,13 @@ arch dungeon_floor x 1 y 12 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 5 sp 12 x 1 y 12 end -arch door_1 -x 1 -y 12 -end arch dungeon_floor x 1 y 13 @@ -257,17 +253,13 @@ arch dungeon_floor x 1 y 16 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 5 sp 16 x 1 y 16 end -arch door_1 -x 1 -y 16 -end arch dungeon_floor x 1 y 17 diff --git a/brest/brittany/dol-guldur.6 b/brest/brittany/dol-guldur.6 index 79f372a7d..f8d6450a8 100644 --- a/brest/brittany/dol-guldur.6 +++ b/brest/brittany/dol-guldur.6 @@ -5,7 +5,7 @@ width 35 height 42 msg Created: 1994-06-02 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dirtfloor @@ -654,17 +654,13 @@ arch dungeon_floor x 2 y 9 end -arch invis_exit +arch oakdoor_2 slaying dol-guldur.1 hp 3 sp 27 x 2 y 9 end -arch door_2 -x 2 -y 9 -end arch dirtfloor x 2 y 10 @@ -1200,17 +1196,13 @@ arch dungeon_floor x 4 y 2 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 5 sp 20 x 4 y 2 end -arch door_1 -x 4 -y 2 -end arch dungeon_floor x 4 y 3 @@ -1239,17 +1231,13 @@ arch dungeon_floor x 4 y 6 end -arch invis_exit +arch oakdoor_1 slaying dol-guldur.1 hp 5 sp 24 x 4 y 6 end -arch door_1 -x 4 -y 6 -end arch dirtfloor x 4 y 7 diff --git a/brest/brittany/jessy.1 b/brest/brittany/jessy.1 index fa4172d79..6dadb2b76 100644 --- a/brest/brittany/jessy.1 +++ b/brest/brittany/jessy.1 @@ -7,7 +7,7 @@ height 30 enter_x 16 enter_y 29 msg -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -3465,17 +3465,13 @@ arch cobblestones2 x 16 y 29 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_122 hp 7 sp 32 x 16 y 29 end -arch door_look_1 -x 16 -y 29 -end arch woodfloor x 17 end diff --git a/brest/brittany/tower_of__zoon b/brest/brittany/tower_of__zoon index 522d07153..f20c9af82 100644 --- a/brest/brittany/tower_of__zoon +++ b/brest/brittany/tower_of__zoon @@ -5,7 +5,7 @@ width 40 height 40 msg Created: 1994-02-31 -Modified: 2008-11-26 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dirtfloor @@ -21,15 +21,12 @@ end arch dirtfloor y 2 end -arch invis_exit +arch oakdoor_1 slaying /world/world_107_123 hp 30 sp 0 y 2 end -arch door_look_2 -y 2 -end arch dirtfloor y 3 end diff --git a/brest/elec.jes b/brest/elec.jes index a15a41575..0d3765baf 100644 --- a/brest/elec.jes +++ b/brest/elec.jes @@ -8,7 +8,7 @@ enter_x 1 enter_y 46 msg Created: 1994-05-31 -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dungeon_floor @@ -563,17 +563,14 @@ arch dungeon_floor x 1 y 47 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_123 +face odoor_2_fant_red-yellow.111 hp 29 sp 34 x 1 y 47 end -arch odoor_2_fant_red-yellow -x 1 -y 47 -end arch dungeon_floor x 2 end diff --git a/brest/jes.admini b/brest/jes.admini index ac67244c9..568a85f3e 100644 --- a/brest/jes.admini +++ b/brest/jes.admini @@ -8,7 +8,7 @@ enter_x 21 enter_y 2 msg Created: 1994-05-31 -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch grass @@ -3016,6 +3016,7 @@ y 29 end arch grass x 18 +move_block all end arch woodfloor x 18 @@ -3187,6 +3188,7 @@ y 29 end arch grass x 19 +move_block all end arch grass x 19 @@ -3325,6 +3327,7 @@ y 29 end arch cobblestones2 x 20 +move_block all end arch cobblestones2 x 20 @@ -3463,6 +3466,7 @@ y 29 end arch cobblestones2 x 21 +move_block all end arch cobblestones2 x 21 @@ -3597,6 +3601,7 @@ y 29 end arch grass x 22 +move_block all end arch grass x 22 @@ -3735,6 +3740,7 @@ y 29 end arch grass x 23 +move_block all end arch woodfloor x 23 diff --git a/brest/pshops/pshop1/gfloor b/brest/pshops/pshop1/gfloor index c816abbd8..a698b3f79 100644 --- a/brest/pshops/pshop1/gfloor +++ b/brest/pshops/pshop1/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 4 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop10/gfloor b/brest/pshops/pshop10/gfloor index 4c76ed3b3..7c41dc037 100644 --- a/brest/pshops/pshop10/gfloor +++ b/brest/pshops/pshop10/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 31 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop11/gfloor b/brest/pshops/pshop11/gfloor index 0abaee2a8..4de57481a 100644 --- a/brest/pshops/pshop11/gfloor +++ b/brest/pshops/pshop11/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 34 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop12/gfloor b/brest/pshops/pshop12/gfloor index 20e605060..6702f2dad 100644 --- a/brest/pshops/pshop12/gfloor +++ b/brest/pshops/pshop12/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 37 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop13/gfloor b/brest/pshops/pshop13/gfloor index 43b8a77f2..c918d9131 100644 --- a/brest/pshops/pshop13/gfloor +++ b/brest/pshops/pshop13/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 40 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop14/gfloor b/brest/pshops/pshop14/gfloor index 1efa90d86..f436d267e 100644 --- a/brest/pshops/pshop14/gfloor +++ b/brest/pshops/pshop14/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 1 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop15/gfloor b/brest/pshops/pshop15/gfloor index 7fbeca5bc..2ae10d72e 100644 --- a/brest/pshops/pshop15/gfloor +++ b/brest/pshops/pshop15/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 4 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop16/gfloor b/brest/pshops/pshop16/gfloor index 90057827b..07fa4f1fc 100644 --- a/brest/pshops/pshop16/gfloor +++ b/brest/pshops/pshop16/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 7 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop17/gfloor b/brest/pshops/pshop17/gfloor index e070c7a52..5ef28b61a 100644 --- a/brest/pshops/pshop17/gfloor +++ b/brest/pshops/pshop17/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 10 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop18/gfloor b/brest/pshops/pshop18/gfloor index 6cf75a98e..35d873ff7 100644 --- a/brest/pshops/pshop18/gfloor +++ b/brest/pshops/pshop18/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 13 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop19/gfloor b/brest/pshops/pshop19/gfloor index ea887e36a..d56a06a31 100644 --- a/brest/pshops/pshop19/gfloor +++ b/brest/pshops/pshop19/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 16 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop2/gfloor b/brest/pshops/pshop2/gfloor index 270da99d3..b074df88f 100644 --- a/brest/pshops/pshop2/gfloor +++ b/brest/pshops/pshop2/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 7 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop20/gfloor b/brest/pshops/pshop20/gfloor index fe3b13a44..e4954deb6 100644 --- a/brest/pshops/pshop20/gfloor +++ b/brest/pshops/pshop20/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 19 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop21/gfloor b/brest/pshops/pshop21/gfloor index 56ce87f96..f242426ac 100644 --- a/brest/pshops/pshop21/gfloor +++ b/brest/pshops/pshop21/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 22 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop22/gfloor b/brest/pshops/pshop22/gfloor index a62ffbd14..b8ac6a8be 100644 --- a/brest/pshops/pshop22/gfloor +++ b/brest/pshops/pshop22/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 25 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop23/gfloor b/brest/pshops/pshop23/gfloor index 16e881a42..fedf4fd89 100644 --- a/brest/pshops/pshop23/gfloor +++ b/brest/pshops/pshop23/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 28 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop24/gfloor b/brest/pshops/pshop24/gfloor index 56c69816e..19d5abf4d 100644 --- a/brest/pshops/pshop24/gfloor +++ b/brest/pshops/pshop24/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 31 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop25/gfloor b/brest/pshops/pshop25/gfloor index 324eaf39b..3e83fac62 100644 --- a/brest/pshops/pshop25/gfloor +++ b/brest/pshops/pshop25/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 34 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop26/gfloor b/brest/pshops/pshop26/gfloor index ae93b868e..9a24f1be3 100644 --- a/brest/pshops/pshop26/gfloor +++ b/brest/pshops/pshop26/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 37 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop27/gfloor b/brest/pshops/pshop27/gfloor index f5a88b8e0..0c32819a6 100644 --- a/brest/pshops/pshop27/gfloor +++ b/brest/pshops/pshop27/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 40 sp 6 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop3/gfloor b/brest/pshops/pshop3/gfloor index cbf1c7d6b..dc893ead6 100644 --- a/brest/pshops/pshop3/gfloor +++ b/brest/pshops/pshop3/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 10 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop4/gfloor b/brest/pshops/pshop4/gfloor index e3e6a0235..ebc71d880 100644 --- a/brest/pshops/pshop4/gfloor +++ b/brest/pshops/pshop4/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 13 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop5/gfloor b/brest/pshops/pshop5/gfloor index df52bcc00..e9b728e1b 100644 --- a/brest/pshops/pshop5/gfloor +++ b/brest/pshops/pshop5/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 16 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop6/gfloor b/brest/pshops/pshop6/gfloor index ff455e93d..c8c4a5d3f 100644 --- a/brest/pshops/pshop6/gfloor +++ b/brest/pshops/pshop6/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 19 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop7/gfloor b/brest/pshops/pshop7/gfloor index 5e2d3fd3e..4b069850b 100644 --- a/brest/pshops/pshop7/gfloor +++ b/brest/pshops/pshop7/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 22 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop8/gfloor b/brest/pshops/pshop8/gfloor index e309f7d67..cf1eef29c 100644 --- a/brest/pshops/pshop8/gfloor +++ b/brest/pshops/pshop8/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 25 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshop9/gfloor b/brest/pshops/pshop9/gfloor index 20dbb3bd2..895a44749 100644 --- a/brest/pshops/pshop9/gfloor +++ b/brest/pshops/pshop9/gfloor @@ -7,7 +7,7 @@ enter_x 12 enter_y 21 msg Created: 2004-10-17 majorwoo josh@woosworld.net -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch woodfloor @@ -2980,17 +2980,13 @@ arch woodfloor x 12 y 21 end -arch invis_exit +arch oakdoor_2 slaying ../pshops_main hp 28 sp 2 x 12 y 21 end -arch door_2 -x 12 -y 21 -end arch woodfloor x 13 end diff --git a/brest/pshops/pshopsinc b/brest/pshops/pshopsinc index cc3c9d795..9b0e4f662 100644 --- a/brest/pshops/pshopsinc +++ b/brest/pshops/pshopsinc @@ -6,7 +6,7 @@ width 36 height 14 msg Created: 2004-10-17 majorwoo (josh@woosworld.net) -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch dungeon_magic @@ -2183,17 +2183,13 @@ arch woodfloor x 15 y 10 end -arch invis_exit +arch oakdoor_2 slaying pshops_main hp 2 sp 2 x 15 y 10 end -arch door_2 -x 15 -y 10 -end arch blocked x 15 y 11 diff --git a/brest/shops/buildshop b/brest/shops/buildshop index 854df98ef..e5f348538 100644 --- a/brest/shops/buildshop +++ b/brest/shops/buildshop @@ -13,7 +13,7 @@ enter_x 6 enter_y 24 msg Created: 2005-11-05 Gene Alexander -Modified: 2008-11-27 Rick Tanner +Modified: 2008-12-01 Rick Tanner endmsg end arch flagstone @@ -1050,17 +1050,13 @@ arch tile_floor x 6 y 25 end -arch invis_exit +arch oakdoor_2 slaying /world/world_107_123 hp 21 sp 32 x 6 y 25 end -arch odoor_2_fant_brown -x 6 -y 25 -end arch brush x 6 y 26