From 598a17bdd914df14c5259a392690b3beab55d23b Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Thu, 6 Oct 2005 20:40:54 +0000 Subject: [PATCH] Fix incorrect exit coordinates. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@3803 282e977c-c81d-0410-88c4-b93c2d0d6712 --- brest/black_shield/ground | 4 ++-- darcap/darcap/guilds/poisoned_dagger/ground | 4 ++-- darcap/darcap/guilds/smoking_cauldron/ground | 4 ++-- darcap/forgotten_town/city | 4 ++-- darcap/forgotten_town/enter | 2 ++ lake_country/Butakis/Rlib1 | 1 + navar_city/dreaming_sage/ground | 4 ++-- pup_land/guilds/laughing_skull/ground | 4 ++-- pup_land/guilds/purple_butterfly/ground | 4 ++-- quests/peterm/Nethack_in_crossfire_entrance | 2 ++ quests/peterm/quests/wyvern_quest | 2 ++ santo_dominion/crossfire | 1 + santo_dominion/guilds/drunken_barbarian/ground | 4 ++-- santo_dominion/shops/eliks | 2 +- santo_dominion/shops/erash | 2 +- santo_dominion/south_barn | 2 ++ scorn/guilds/mailed_fist/ground | 4 ++-- scorn/towers/tower.mad1 | 1 + scorn/towers/tower.mad2 | 2 ++ wolfsburg/guilds/damned_heretics/ground | 4 ++-- wolfsburg/prison | 1 + wolfsburg/temple/temp_dung1 | 2 ++ wolfsburg/volcano/volcano | 1 + wolfsburg/ware1 | 2 ++ wolfsburg/whorehouse | 1 + world/world_102_108 | 2 ++ world/world_116_102 | 4 ++++ 27 files changed, 48 insertions(+), 22 deletions(-) diff --git a/brest/black_shield/ground b/brest/black_shield/ground index ac56ce89c..8a226021b 100644 --- a/brest/black_shield/ground +++ b/brest/black_shield/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/darcap/darcap/guilds/poisoned_dagger/ground b/darcap/darcap/guilds/poisoned_dagger/ground index 82af49abd..cfd0124da 100644 --- a/darcap/darcap/guilds/poisoned_dagger/ground +++ b/darcap/darcap/guilds/poisoned_dagger/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/darcap/darcap/guilds/smoking_cauldron/ground b/darcap/darcap/guilds/smoking_cauldron/ground index afa3ee41f..fc3d84c86 100644 --- a/darcap/darcap/guilds/smoking_cauldron/ground +++ b/darcap/darcap/guilds/smoking_cauldron/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/darcap/forgotten_town/city b/darcap/forgotten_town/city index 78d5993a2..05e563d5b 100644 --- a/darcap/forgotten_town/city +++ b/darcap/forgotten_town/city @@ -8795,8 +8795,8 @@ y 49 end arch dragon_exit slaying enter -hp 10 -sp 17 +hp 11 +sp 18 x 1 y 1 end diff --git a/darcap/forgotten_town/enter b/darcap/forgotten_town/enter index 0a6bd8773..2382be974 100644 --- a/darcap/forgotten_town/enter +++ b/darcap/forgotten_town/enter @@ -3119,4 +3119,6 @@ arch dragon_exit slaying city x 10 y 17 +hp 2 +sp 2 end diff --git a/lake_country/Butakis/Rlib1 b/lake_country/Butakis/Rlib1 index 54928daaf..0c1414827 100644 --- a/lake_country/Butakis/Rlib1 +++ b/lake_country/Butakis/Rlib1 @@ -1307,6 +1307,7 @@ end arch stair_3_up slaying Rlib2 hp 12 +sp 8 x 12 y 9 end diff --git a/navar_city/dreaming_sage/ground b/navar_city/dreaming_sage/ground index c99d3dcf3..f27d641cb 100644 --- a/navar_city/dreaming_sage/ground +++ b/navar_city/dreaming_sage/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/pup_land/guilds/laughing_skull/ground b/pup_land/guilds/laughing_skull/ground index 174f427f2..88c07e915 100644 --- a/pup_land/guilds/laughing_skull/ground +++ b/pup_land/guilds/laughing_skull/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/pup_land/guilds/purple_butterfly/ground b/pup_land/guilds/purple_butterfly/ground index 18028c402..81671fead 100644 --- a/pup_land/guilds/purple_butterfly/ground +++ b/pup_land/guilds/purple_butterfly/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/quests/peterm/Nethack_in_crossfire_entrance b/quests/peterm/Nethack_in_crossfire_entrance index 782fd59fb..3183c5e0f 100644 --- a/quests/peterm/Nethack_in_crossfire_entrance +++ b/quests/peterm/Nethack_in_crossfire_entrance @@ -5,6 +5,8 @@ Creator: Gnat the Gnu Email: gnu@foo.bar Date: Sun May 6 21:39:27 2001 endmsg +enter_x 1 +enter_y 1 width 16 height 16 difficulty 9999 diff --git a/quests/peterm/quests/wyvern_quest b/quests/peterm/quests/wyvern_quest index 41b0dfcb0..72d1f0e6d 100644 --- a/quests/peterm/quests/wyvern_quest +++ b/quests/peterm/quests/wyvern_quest @@ -7,6 +7,8 @@ Date: Wed Jun 7 18:28:01 2000 endmsg width 21 height 37 +enter_x 1 +enter_y 2 end arch medium_stones end diff --git a/santo_dominion/crossfire b/santo_dominion/crossfire index 27d78971f..6177ffe98 100644 --- a/santo_dominion/crossfire +++ b/santo_dominion/crossfire @@ -1,5 +1,6 @@ arch map region santodominion +hp 1 sp 17 x 30 y 30 diff --git a/santo_dominion/guilds/drunken_barbarian/ground b/santo_dominion/guilds/drunken_barbarian/ground index 1444cf04d..4d1000b91 100644 --- a/santo_dominion/guilds/drunken_barbarian/ground +++ b/santo_dominion/guilds/drunken_barbarian/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/santo_dominion/shops/eliks b/santo_dominion/shops/eliks index 6d08168cf..6d4120685 100644 --- a/santo_dominion/shops/eliks +++ b/santo_dominion/shops/eliks @@ -101,7 +101,7 @@ end arch oakdoor slaying /world/world_102_108 hp 21 -sp 12 +sp 13 x 1 y 1 end diff --git a/santo_dominion/shops/erash b/santo_dominion/shops/erash index d052461f0..6d8994522 100644 --- a/santo_dominion/shops/erash +++ b/santo_dominion/shops/erash @@ -1,6 +1,6 @@ arch map region santodominion -hp 8 +hp 10 sp 1 x 12 y 20 diff --git a/santo_dominion/south_barn b/santo_dominion/south_barn index 21324464c..9e81615a4 100644 --- a/santo_dominion/south_barn +++ b/santo_dominion/south_barn @@ -1,5 +1,7 @@ arch map region santodominion +hp 1 +sp 1 x 40 y 40 end diff --git a/scorn/guilds/mailed_fist/ground b/scorn/guilds/mailed_fist/ground index 479f08ba5..6a056561c 100644 --- a/scorn/guilds/mailed_fist/ground +++ b/scorn/guilds/mailed_fist/ground @@ -5342,8 +5342,8 @@ arch perm_magic_portal name Big Chest face chest_1.111 slaying bigchest -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 is_animated 0 fly_on 0 diff --git a/scorn/towers/tower.mad1 b/scorn/towers/tower.mad1 index 76faabcce..1a35e487e 100644 --- a/scorn/towers/tower.mad1 +++ b/scorn/towers/tower.mad1 @@ -1,5 +1,6 @@ arch map region scorn +hp 1 sp 13 end arch woodfloor diff --git a/scorn/towers/tower.mad2 b/scorn/towers/tower.mad2 index 207d2d831..db65da8d1 100644 --- a/scorn/towers/tower.mad2 +++ b/scorn/towers/tower.mad2 @@ -6,6 +6,8 @@ Creator: Gnat the Gnu Email: gnu@foo.bar Date: Sat May 27 00:36:48 2000 endmsg +hp 1 +sp 1 end arch woodfloor end diff --git a/wolfsburg/guilds/damned_heretics/ground b/wolfsburg/guilds/damned_heretics/ground index 59a30401b..c2b7c5fb5 100644 --- a/wolfsburg/guilds/damned_heretics/ground +++ b/wolfsburg/guilds/damned_heretics/ground @@ -5343,8 +5343,8 @@ face chest_1.111 slaying bigchest unique 1 is_animated 0 -hp 0 -sp 0 +hp 1 +sp 1 walk_on 0 fly_on 0 x 24 diff --git a/wolfsburg/prison b/wolfsburg/prison index ba930a205..7a919b5fb 100644 --- a/wolfsburg/prison +++ b/wolfsburg/prison @@ -3,6 +3,7 @@ region wolfsburg msg endmsg hp 14 +sp 1 x 30 y 25 end diff --git a/wolfsburg/temple/temp_dung1 b/wolfsburg/temple/temp_dung1 index 5e9b6392e..674fabdc0 100644 --- a/wolfsburg/temple/temp_dung1 +++ b/wolfsburg/temple/temp_dung1 @@ -3,6 +3,8 @@ region wolfsburg msg endmsg +hp 1 +sp 1 x 46 y 37 end diff --git a/wolfsburg/volcano/volcano b/wolfsburg/volcano/volcano index 1464a7ecc..4b75d7bd9 100644 --- a/wolfsburg/volcano/volcano +++ b/wolfsburg/volcano/volcano @@ -4,6 +4,7 @@ msg endmsg hp 1 +sp 1 x 25 y 25 end diff --git a/wolfsburg/ware1 b/wolfsburg/ware1 index 84c8992b0..30e147ec1 100644 --- a/wolfsburg/ware1 +++ b/wolfsburg/ware1 @@ -2,6 +2,8 @@ arch map region wolfsburg msg endmsg +hp 1 +sp 1 x 35 y 35 end diff --git a/wolfsburg/whorehouse b/wolfsburg/whorehouse index c8b21dbf7..1a3cc8e5f 100644 --- a/wolfsburg/whorehouse +++ b/wolfsburg/whorehouse @@ -2,6 +2,7 @@ arch map region wolfsburg msg endmsg +hp 1 x 20 y 20 end diff --git a/world/world_102_108 b/world/world_102_108 index 91d3e68ae..b08eb8ebd 100644 --- a/world/world_102_108 +++ b/world/world_102_108 @@ -10835,6 +10835,8 @@ name Eliks General Store slaying /santo_dominion/shops/eliks x 21 y 12 +hp 1 +sp 1 end arch t_house2 name City Hall diff --git a/world/world_116_102 b/world/world_116_102 index c87922d1c..aba8fa898 100644 --- a/world/world_116_102 +++ b/world/world_116_102 @@ -13281,12 +13281,16 @@ name Smith's Armors slaying /darcap/darcap/shop_a x 25 y 37 +hp 1 +sp 14 end arch store_general name Bob's Fish & Chips slaying /darcap/darcap/shop_g x 25 y 43 +hp 2 +sp 1 end arch hovels2 x 26