From ff873fc167e605048020fab7d8d66d250d79fe52 Mon Sep 17 00:00:00 2001 From: rjtanner Date: Thu, 4 Dec 2008 06:03:00 +0000 Subject: [PATCH] Replace recently updated oakdoors with new archetype and recycled graphic, updated map entrance coordinates. Requires archetype r10798 or newer. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@10828 282e977c-c81d-0410-88c4-b93c2d0d6712 --- pup_land/ancient/ruin/house1 | 5 +-- pup_land/ancient/ruin/house2 | 5 +-- pup_land/ancient/ruin/house3 | 5 +-- pup_land/ancient/ruin/house4 | 5 +-- pup_land/ancient/ruin/house5 | 5 +-- pup_land/ancient/ruin/shop | 38 +++++++++-------------- pup_land/ancient/ruin/village | 7 ++++- pup_land/ancient/village/library | 6 ++-- pup_land/ancient/village/shop | 18 +++++------ pup_land/ancient/village/tavern | 6 ++-- pup_land/ancient/village/tavern1 | 6 ++-- pup_land/ancient/village/village | 6 ++-- pup_land/lone_town/bank | 14 ++++----- pup_land/lone_town/cordish | 6 ++-- pup_land/lone_town/dragonhangar/hangar | 14 ++++----- pup_land/lone_town/dress1 | 6 ++-- pup_land/lone_town/gemshop | 7 +++-- pup_land/lone_town/gshop | 6 ++-- pup_land/lone_town/inn | 6 ++-- pup_land/lone_town/magic | 6 ++-- pup_land/lone_town/mshop | 5 +-- pup_land/lone_town/shops/transport.shoppe | 9 ++---- pup_land/lone_town/tavern | 6 ++-- pup_land/lone_town/town | 19 +++++++----- pup_land/lone_town/training | 5 +-- 25 files changed, 111 insertions(+), 110 deletions(-) diff --git a/pup_land/ancient/ruin/house1 b/pup_land/ancient/ruin/house1 index 80106a85e..68bb7beeb 100644 --- a/pup_land/ancient/ruin/house1 +++ b/pup_land/ancient/ruin/house1 @@ -5,9 +5,10 @@ region ancientpupland width 16 height 16 enter_x 7 +enter_y 1 msg Created: 1996-05-07 -Modified: 2008-10-07 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch pstone_1 @@ -702,7 +703,7 @@ end arch pstone_1 x 7 end -arch oakdoor +arch oakdoor_2 slaying village hp 5 sp 6 diff --git a/pup_land/ancient/ruin/house2 b/pup_land/ancient/ruin/house2 index 119e635fe..280a91c10 100644 --- a/pup_land/ancient/ruin/house2 +++ b/pup_land/ancient/ruin/house2 @@ -5,9 +5,10 @@ region ancientpupland width 19 height 16 enter_x 7 +enter_y 1 msg Created: 1996-05-07 -Modified: 2008-10-07 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch pstone_1 @@ -652,7 +653,7 @@ end arch pstone_1 x 7 end -arch oakdoor +arch oakdoor_2 slaying village hp 14 sp 6 diff --git a/pup_land/ancient/ruin/house3 b/pup_land/ancient/ruin/house3 index 386632161..286c03c9f 100644 --- a/pup_land/ancient/ruin/house3 +++ b/pup_land/ancient/ruin/house3 @@ -5,9 +5,10 @@ region ancientpupland width 16 height 22 enter_x 7 +enter_y 1 msg Created: 1996-05-07 -Modified: 2008-10-07 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch invis_exit @@ -879,7 +880,7 @@ end arch cobblestones2 x 7 end -arch oakdoor +arch oakdoor_2 slaying village hp 5 sp 14 diff --git a/pup_land/ancient/ruin/house4 b/pup_land/ancient/ruin/house4 index 5fba280a1..6c21816ce 100644 --- a/pup_land/ancient/ruin/house4 +++ b/pup_land/ancient/ruin/house4 @@ -5,9 +5,10 @@ region ancientpupland width 16 height 16 enter_x 7 +enter_y 1 msg Created: 1996-05-07 -Modified: 2008-10-07 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch pstone_1 @@ -738,7 +739,7 @@ end arch pstone_1 x 7 end -arch oakdoor +arch oakdoor_2 slaying village hp 10 sp 13 diff --git a/pup_land/ancient/ruin/house5 b/pup_land/ancient/ruin/house5 index 90775c7cc..6c80a135b 100644 --- a/pup_land/ancient/ruin/house5 +++ b/pup_land/ancient/ruin/house5 @@ -4,10 +4,11 @@ difficulty 9 region ancientpupland width 18 height 16 +enter_x 1 enter_y 8 msg Created: 1996-05-07 -Modified: 2008-10-07 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch pstone_1 @@ -62,7 +63,7 @@ end arch pstone_1 y 8 end -arch oakdoor +arch oakdoor_1 slaying village hp 14 sp 14 diff --git a/pup_land/ancient/ruin/shop b/pup_land/ancient/ruin/shop index ead9ee85d..f0b9086fd 100644 --- a/pup_land/ancient/ruin/shop +++ b/pup_land/ancient/ruin/shop @@ -8,12 +8,12 @@ enter_x 1 enter_y 1 msg Created: 1996-02-30 -Modified: 2008-10-27 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch pstone_1 end -arch wall_2_2_2 +arch wall_1_1 end arch pstone_1 y 1 @@ -114,18 +114,14 @@ end arch pstone_1 x 1 end -arch wall_2_1_2 -x 1 -end -arch pstone_1 -x 1 -y 1 -end -arch oakdoor +arch oakdoor_2 slaying village hp 9 sp 9 x 1 +end +arch pstone_1 +x 1 y 1 end arch pstone_1 @@ -218,7 +214,7 @@ end arch pstone_1 x 2 end -arch wall_1_3_ruin +arch wall_1_4 x 2 end arch pstone_1 @@ -307,13 +303,10 @@ arch wall_2_1_2 x 2 y 15 end -arch invis_exit -slaying village -hp 9 -sp 9 +arch pstone_1 x 3 end -arch pstone_1 +arch wall_1_3_ruin x 3 end arch pstone_1 @@ -417,17 +410,16 @@ arch wall_2_1_2 x 3 y 15 end -arch pstone_1 -x 4 -end -arch wall_1_4_ruin +arch invis_exit +slaying village +hp 9 +sp 9 x 4 end arch pstone_1 x 4 -y 1 end -arch swall_2_1_1 +arch pstone_1 x 4 y 1 end @@ -528,7 +520,7 @@ end arch pstone_1 x 5 end -arch wall_2_1_2 +arch wall_1_4_ruin x 5 end arch pstone_1 diff --git a/pup_land/ancient/ruin/village b/pup_land/ancient/ruin/village index ac6c1802a..3b8de2ed7 100644 --- a/pup_land/ancient/ruin/village +++ b/pup_land/ancient/ruin/village @@ -8,7 +8,7 @@ enter_x 8 enter_y 2 msg Created: 1996-02-30 -Modified: 2008-10-26 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch invis_exit @@ -685,6 +685,7 @@ end arch ruins slaying house1 hp 7 +sp 1 x 5 y 6 end @@ -727,6 +728,7 @@ end arch ruins slaying house3 hp 7 +sp 1 x 5 y 14 end @@ -1263,6 +1265,7 @@ end arch ruins slaying house4 hp 7 +sp 1 x 10 y 13 end @@ -1668,6 +1671,7 @@ end arch ruins slaying house2 hp 7 +sp 1 x 14 y 6 end @@ -1705,6 +1709,7 @@ y 14 end arch ruins slaying house5 +hp 1 sp 8 x 14 y 14 diff --git a/pup_land/ancient/village/library b/pup_land/ancient/village/library index 900525e52..a082a3cbf 100644 --- a/pup_land/ancient/village/library +++ b/pup_land/ancient/village/library @@ -5,10 +5,10 @@ region ancientpupland width 15 height 14 enter_x 6 -enter_y 13 +enter_y 12 msg Created: 2000-06-03 -Modified: 2008-10-25 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch dungeon_magic @@ -1070,7 +1070,7 @@ arch woodfloor x 6 y 13 end -arch oakdoor +arch oakdoor_2 slaying village hp 19 sp 13 diff --git a/pup_land/ancient/village/shop b/pup_land/ancient/village/shop index 3851fe4ca..39448f6a6 100644 --- a/pup_land/ancient/village/shop +++ b/pup_land/ancient/village/shop @@ -11,7 +11,7 @@ enter_x 7 enter_y 8 msg Created: 1996-05-21 -Modified: 2008-10-27 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch blocked @@ -388,7 +388,7 @@ arch afloor_right x 6 y 9 end -arch wwall_2_1_2 +arch wwall_1_3 x 6 y 9 end @@ -468,18 +468,14 @@ arch afloor_right x 7 y 8 end -arch oakdoor -slaying village -hp 20 -sp 8 -x 7 -y 8 -end arch afloor_right x 7 y 9 end -arch wwall_2_1_2 +arch oakdoor_2 +slaying village +hp 20 +sp 8 x 7 y 9 end @@ -533,7 +529,7 @@ arch afloor_right x 8 y 9 end -arch wwall_2_1_2 +arch wwall_1_4 x 8 y 9 end diff --git a/pup_land/ancient/village/tavern b/pup_land/ancient/village/tavern index 4d46ec891..3e862f610 100644 --- a/pup_land/ancient/village/tavern +++ b/pup_land/ancient/village/tavern @@ -5,10 +5,10 @@ region ancientpupland width 16 height 18 enter_x 1 -enter_y 17 +enter_y 16 msg Created: 1996-05-21 -Modified: 2008-10-09 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch woodfloor @@ -259,7 +259,7 @@ arch woodfloor x 1 y 17 end -arch oakdoor +arch oakdoor_2 slaying village hp 12 sp 11 diff --git a/pup_land/ancient/village/tavern1 b/pup_land/ancient/village/tavern1 index 1c562efb7..269e803eb 100644 --- a/pup_land/ancient/village/tavern1 +++ b/pup_land/ancient/village/tavern1 @@ -5,10 +5,10 @@ region ancientpupland width 34 height 19 enter_x 1 -enter_y 17 +enter_y 16 msg Created: 1996-05-21 -Modified: 2008-10-26 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch woodfloor @@ -254,7 +254,7 @@ arch woodfloor x 1 y 17 end -arch oakdoor +arch oakdoor_2 slaying village hp 12 sp 11 diff --git a/pup_land/ancient/village/village b/pup_land/ancient/village/village index ec0ff812f..c8a1ecd21 100644 --- a/pup_land/ancient/village/village +++ b/pup_land/ancient/village/village @@ -8,7 +8,7 @@ enter_x 7 enter_y 14 msg Created: 1996-05-17 -Modified: 2008-10-27 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch pstone_2 @@ -1940,7 +1940,7 @@ arch house_1 name Lone Village Tavern slaying tavern1 hp 1 -sp 17 +sp 16 x 12 y 11 end @@ -2909,7 +2909,7 @@ arch r_house2 name Lone Village Library slaying library hp 6 -sp 13 +sp 12 x 19 y 13 end diff --git a/pup_land/lone_town/bank b/pup_land/lone_town/bank index 2a4f8e49e..18a3739cd 100644 --- a/pup_land/lone_town/bank +++ b/pup_land/lone_town/bank @@ -5,10 +5,10 @@ region lonetown width 19 height 20 enter_x 9 -enter_y 19 +enter_y 18 msg Created: 1996-01-29 -Modified: 2008-10-10 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch afloor_right @@ -1647,21 +1647,21 @@ arch dungeon_magic x 9 y 18 end +arch dungeon_magic +x 9 +y 19 +end arch afloor_right x 9 y 19 end -arch oakdoor +arch oakdoor_2 slaying town hp 6 sp 13 x 9 y 19 end -arch dungeon_magic -x 9 -y 19 -end arch afloor_right x 10 end diff --git a/pup_land/lone_town/cordish b/pup_land/lone_town/cordish index 3ea0c2b66..1efcaf007 100644 --- a/pup_land/lone_town/cordish +++ b/pup_land/lone_town/cordish @@ -5,10 +5,10 @@ region lonetown width 16 height 16 enter_x 7 -enter_y 15 +enter_y 14 msg Created: 1996-01-28 -Modified: 2008-10-10 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch invis_exit @@ -883,7 +883,7 @@ arch woodfloor x 7 y 15 end -arch oakdoor +arch oakdoor_2 slaying town hp 17 sp 14 diff --git a/pup_land/lone_town/dragonhangar/hangar b/pup_land/lone_town/dragonhangar/hangar index ceab5a4a1..f5675f166 100644 --- a/pup_land/lone_town/dragonhangar/hangar +++ b/pup_land/lone_town/dragonhangar/hangar @@ -8,7 +8,7 @@ enter_x 16 enter_y 1 msg Created: 1997-06-19 -Modified: 2008-10-28 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch magic_banned @@ -4677,9 +4677,9 @@ end arch cobblestones2 x 14 end -arch oakdoor +arch oakdoor_2 slaying /pup_land/lone_town/town -hp 22 +hp 23 sp 16 x 14 end @@ -4999,9 +4999,9 @@ end arch cobblestones2 x 15 end -arch oakdoor +arch oakdoor_2 slaying /pup_land/lone_town/town -hp 22 +hp 23 sp 16 x 15 end @@ -5346,7 +5346,7 @@ end arch cobblestones2 x 16 end -arch oakdoor +arch oakdoor_2 slaying /pup_land/lone_town/town hp 23 sp 16 @@ -5693,7 +5693,7 @@ end arch cobblestones2 x 17 end -arch oakdoor +arch oakdoor_2 slaying /pup_land/lone_town/town hp 23 sp 16 diff --git a/pup_land/lone_town/dress1 b/pup_land/lone_town/dress1 index f5c10ea91..ea1003fe3 100644 --- a/pup_land/lone_town/dress1 +++ b/pup_land/lone_town/dress1 @@ -4,11 +4,11 @@ difficulty 10 region lonetown width 16 height 16 -enter_x 15 +enter_x 14 enter_y 7 msg Created: 1996-01-27 -Modified: 2008-10-21 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch woodfloor @@ -1946,7 +1946,7 @@ arch pstone_1 x 15 y 7 end -arch oakdoor +arch oakdoor_1 slaying town hp 14 sp 1 diff --git a/pup_land/lone_town/gemshop b/pup_land/lone_town/gemshop index 06bb24a74..cf735a2f2 100644 --- a/pup_land/lone_town/gemshop +++ b/pup_land/lone_town/gemshop @@ -7,10 +7,11 @@ shopmin 20 shopmax 35000 width 20 height 20 +enter_x 1 enter_y 8 msg Created: 1996-03-14 -Modified: 2008-10-23 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch grass @@ -54,7 +55,7 @@ end arch woodfloor y 8 end -arch oakdoor +arch oakdoor_1 slaying town hp 13 sp 6 @@ -63,7 +64,7 @@ end arch woodfloor y 9 end -arch oakdoor +arch oakdoor_1 slaying town hp 13 sp 6 diff --git a/pup_land/lone_town/gshop b/pup_land/lone_town/gshop index df41c312c..2f8ffdbd4 100644 --- a/pup_land/lone_town/gshop +++ b/pup_land/lone_town/gshop @@ -8,10 +8,10 @@ shopmax 1500 width 15 height 16 enter_x 7 -enter_y 15 +enter_y 14 msg Created: 1996-01-25 -Modified: 2008-10-23 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch shop_empty @@ -719,7 +719,7 @@ arch cobblestones2 x 7 y 15 end -arch oakdoor +arch oakdoor_2 slaying town hp 10 sp 10 diff --git a/pup_land/lone_town/inn b/pup_land/lone_town/inn index 1d7799b67..68c355f73 100644 --- a/pup_land/lone_town/inn +++ b/pup_land/lone_town/inn @@ -5,10 +5,10 @@ region lonetown width 20 height 9 enter_x 9 -enter_y 8 +enter_y 7 msg Created: 1996-01-25 -Modified: 2008-10-24 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch flagstone @@ -601,7 +601,7 @@ arch cobblestones x 9 y 8 end -arch oakdoor +arch oakdoor_2 slaying town hp 16 sp 16 diff --git a/pup_land/lone_town/magic b/pup_land/lone_town/magic index 504287554..77a4d35b3 100644 --- a/pup_land/lone_town/magic +++ b/pup_land/lone_town/magic @@ -5,10 +5,10 @@ region lonetown width 20 height 25 enter_x 7 -enter_y 11 +enter_y 10 msg Created: 1997-11-26 -Modified: 2008-10-11 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch blocked @@ -1571,7 +1571,7 @@ arch flagstone x 7 y 11 end -arch oakdoor +arch oakdoor_2 slaying town hp 12 sp 1 diff --git a/pup_land/lone_town/mshop b/pup_land/lone_town/mshop index c4eab283b..97630b072 100644 --- a/pup_land/lone_town/mshop +++ b/pup_land/lone_town/mshop @@ -6,9 +6,10 @@ shopitems book:85;spellbook:90;potion:75;rod:70;wand:75;amulet:15;gem:10;*:-90 width 28 height 28 enter_x 4 +enter_y 1 msg Created: 1996-01-29 -Modified: 2008-10-25 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch grass @@ -609,7 +610,7 @@ end arch cobblestones2 x 4 end -arch oakdoor +arch oakdoor_2 slaying town hp 13 sp 4 diff --git a/pup_land/lone_town/shops/transport.shoppe b/pup_land/lone_town/shops/transport.shoppe index ce0cb6ed6..c6a6a8054 100644 --- a/pup_land/lone_town/shops/transport.shoppe +++ b/pup_land/lone_town/shops/transport.shoppe @@ -9,10 +9,10 @@ shopmax 2000000 width 25 height 25 enter_x 17 -enter_y 22 +enter_y 21 msg Created: 2007-04-08 Gene Alexander -Modified: 2008-11-25 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch grass @@ -3429,11 +3429,8 @@ arch woodfloor2 x 17 y 22 end -arch oakdoor +arch oakdoor_2 slaying /pup_land/lone_town/town -msg -Thank you for visiting. -endmsg hp 1 sp 15 x 17 diff --git a/pup_land/lone_town/tavern b/pup_land/lone_town/tavern index d52d8486f..03da4b930 100644 --- a/pup_land/lone_town/tavern +++ b/pup_land/lone_town/tavern @@ -5,10 +5,10 @@ region lonetown width 25 height 25 enter_x 12 -enter_y 24 +enter_y 23 msg Created: 1997-01-22 -Modified: 2008-10-26 Rick Tanner +Modified: 2008-12-04 Rick Tanner endmsg end arch afloor_left @@ -1891,7 +1891,7 @@ arch afloor_left x 12 y 24 end -arch oakdoor +arch oakdoor_2 slaying town hp 11 sp 4 diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town index 534f31758..279f3866d 100644 --- a/pup_land/lone_town/town +++ b/pup_land/lone_town/town @@ -8,7 +8,7 @@ enter_x 5 enter_y 18 msg Created: 1996-02-25 -Modified: 2008-10-28 Rick Tanner +Modified: 2008-12-04 Rick Tanner endmsg end arch grass @@ -244,7 +244,7 @@ arch s_shop2 name Lone Town's Ye Olde Shoppe of Transport slaying /pup_land/lone_town/shops/transport.shoppe hp 17 -sp 22 +sp 21 x 1 y 15 end @@ -770,7 +770,7 @@ arch guild name Bank of Lone slaying bank hp 9 -sp 19 +sp 18 x 6 y 12 end @@ -1183,7 +1183,7 @@ arch l_shop1 name Lone Town Tavern slaying tavern hp 12 -sp 24 +sp 23 x 10 y 3 end @@ -1492,7 +1492,7 @@ arch barrack_long name Magic Show ! slaying magic hp 7 -sp 11 +sp 10 x 12 y 1 end @@ -1642,6 +1642,7 @@ arch store_magic name Lone Town Magic Shop slaying mshop hp 4 +sp 1 x 13 y 3 end @@ -1664,6 +1665,7 @@ end arch store_general name Lone Town Gem Shop slaying gemshop +hp 1 sp 8 x 13 y 5 @@ -1809,7 +1811,7 @@ end arch house_1 name Dressing Room slaying dress1 -hp 15 +hp 14 sp 7 x 14 y 1 @@ -2170,7 +2172,7 @@ arch house_long name Lone Town Inn slaying inn hp 9 -sp 8 +sp 7 x 16 y 16 end @@ -2272,7 +2274,7 @@ arch house_1 name House of Cordish slaying cordish hp 7 -sp 15 +sp 14 x 17 y 14 end @@ -2366,6 +2368,7 @@ arch house_small name Lown Town Training Center slaying training hp 1 +sp 1 x 18 y 11 end diff --git a/pup_land/lone_town/training b/pup_land/lone_town/training index d9a882202..75d565e86 100644 --- a/pup_land/lone_town/training +++ b/pup_land/lone_town/training @@ -5,9 +5,10 @@ region lonetown width 25 height 25 enter_x 1 +enter_y 1 msg Created: 1996-01-29 -Modified: 2008-10-26 Rick Tanner +Modified: 2008-12-03 Rick Tanner endmsg end arch cobblestones2 @@ -134,7 +135,7 @@ end arch cobblestones2 x 1 end -arch oakdoor +arch oakdoor_2 slaying town hp 18 sp 11