From 20f5408c4d53f36bfe625ea960323fb29f31a6b3 Mon Sep 17 00:00:00 2001 From: akirschbaum Date: Thu, 22 Oct 2009 23:06:07 +0000 Subject: [PATCH] Adapt exit coordinates to server r12199. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@12200 282e977c-c81d-0410-88c4-b93c2d0d6712 --- .../minatomachi/ketsueki_itsuryuu/ground | 6 ++-- .../minatomachi/ketsueki_itsuryuu/upper | 6 ++-- .../suno-yamatoshi/nenshou_youso/ground | 6 ++-- azumauindo/suno-yamatoshi/nenshou_youso/upper | 6 ++-- azumauindo/zaseki_dzuki_ryoku/ground | 6 ++-- azumauindo/zaseki_dzuki_ryoku/upper | 6 ++-- brest/black_shield/ground | 4 ++- brest/black_shield/upper | 6 ++-- darcap/castle/castle2.1 | 4 ++- darcap/darcap/guilds/poisoned_dagger/ground | 4 ++- darcap/darcap/guilds/poisoned_dagger/upper | 6 ++-- darcap/darcap/guilds/smoking_cauldron/ground | 4 ++- darcap/darcap/guilds/smoking_cauldron/upper | 6 ++-- navar_city/dreaming_sage/ground | 4 ++- navar_city/dreaming_sage/upper | 6 ++-- pup_land/guilds/laughing_skull/ground | 4 ++- pup_land/guilds/laughing_skull/upper | 6 ++-- pup_land/guilds/purple_butterfly/ground | 4 ++- pup_land/guilds/purple_butterfly/upper | 6 ++-- pup_land/nurnberg/city | 4 ++- quests/peterm/Nethack_in_crossfire_entrance | 4 ++- .../guilds/drunken_barbarian/ground | 4 ++- santo_dominion/guilds/drunken_barbarian/upper | 6 ++-- santo_dominion/lord_byron/1st_floor | 8 ++++- santo_dominion/lord_byron/main | 8 ++++- scorn/guilds/mailed_fist/ground | 4 ++- scorn/guilds/mailed_fist/upper | 6 ++-- templates/guild/secondfloor | 5 +-- unlinked/Greyshield/Cavern2 | 3 ++ unlinked/Greyshield/Ruins | 3 ++ unlinked/kandora/cave/cave1 | 4 ++- unlinked/kandora/cave/cave2 | 4 ++- unlinked/kandora/circus/mp_s | 4 ++- unlinked/kandora/circus/mp_world | 12 ++++++- unlinked/kandora/dd_alchemy | 4 ++- unlinked/kandora/denray | 20 ++++++++++- unlinked/kandora/dm_keep | 4 ++- unlinked/kandora/dun_marksel | 13 +++++++ unlinked/kandora/elcyon/old_temple | 3 ++ unlinked/kandora/elcyon/seacity | 6 +++- unlinked/kandora/kandora | 36 ++++++++++++++++++- unlinked/kandora/signal | 4 ++- unlinked/kandora/signal2 | 4 ++- wolfsburg/guilds/damned_heretics/ground | 4 ++- wolfsburg/guilds/damned_heretics/upper | 6 ++-- wolfsburg/slave_pit2 | 4 ++- world/world_105_115 | 4 ++- world/world_129_109 | 4 ++- 48 files changed, 220 insertions(+), 75 deletions(-) diff --git a/azumauindo/minatomachi/ketsueki_itsuryuu/ground b/azumauindo/minatomachi/ketsueki_itsuryuu/ground index 21d3606e3..9e136eff5 100644 --- a/azumauindo/minatomachi/ketsueki_itsuryuu/ground +++ b/azumauindo/minatomachi/ketsueki_itsuryuu/ground @@ -9,7 +9,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 MikeeUSA -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch blocked @@ -5492,8 +5492,8 @@ name Big Chest name_pl Big Chest slaying bigchest face chest_1.111 -hp 0 -sp 0 +hp -1 +sp -1 x 24 y 13 is_animated 0 diff --git a/azumauindo/minatomachi/ketsueki_itsuryuu/upper b/azumauindo/minatomachi/ketsueki_itsuryuu/upper index 19b863eba..4306450d3 100644 --- a/azumauindo/minatomachi/ketsueki_itsuryuu/upper +++ b/azumauindo/minatomachi/ketsueki_itsuryuu/upper @@ -9,7 +9,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 MikeeUSA -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch blocked @@ -8288,8 +8288,8 @@ arch perm_magic_portal name The Mazes of Menace name_pl The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 28 y 9 end diff --git a/azumauindo/suno-yamatoshi/nenshou_youso/ground b/azumauindo/suno-yamatoshi/nenshou_youso/ground index 308c2a342..fcb3a3b9a 100644 --- a/azumauindo/suno-yamatoshi/nenshou_youso/ground +++ b/azumauindo/suno-yamatoshi/nenshou_youso/ground @@ -9,7 +9,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 MikeeUSA -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch blocked @@ -5492,8 +5492,8 @@ name Big Chest name_pl Big Chest slaying bigchest face chest_1.111 -hp 0 -sp 0 +hp -1 +sp -1 x 24 y 13 is_animated 0 diff --git a/azumauindo/suno-yamatoshi/nenshou_youso/upper b/azumauindo/suno-yamatoshi/nenshou_youso/upper index 208c1e2a5..235bac8eb 100644 --- a/azumauindo/suno-yamatoshi/nenshou_youso/upper +++ b/azumauindo/suno-yamatoshi/nenshou_youso/upper @@ -9,7 +9,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 MikeeUSA -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch blocked @@ -8288,8 +8288,8 @@ arch perm_magic_portal name The Mazes of Menace name_pl The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 28 y 9 end diff --git a/azumauindo/zaseki_dzuki_ryoku/ground b/azumauindo/zaseki_dzuki_ryoku/ground index 9155f9369..c27587791 100644 --- a/azumauindo/zaseki_dzuki_ryoku/ground +++ b/azumauindo/zaseki_dzuki_ryoku/ground @@ -9,7 +9,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 MikeeUSA -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch blocked @@ -8953,8 +8953,8 @@ name Big Chest name_pl Big Chest slaying bigchest face chest_1.111 -hp 0 -sp 0 +hp -1 +sp -1 x 24 y 13 is_animated 0 diff --git a/azumauindo/zaseki_dzuki_ryoku/upper b/azumauindo/zaseki_dzuki_ryoku/upper index 5c06038ab..42ecf96a0 100644 --- a/azumauindo/zaseki_dzuki_ryoku/upper +++ b/azumauindo/zaseki_dzuki_ryoku/upper @@ -9,7 +9,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 MikeeUSA -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch blocked @@ -8288,8 +8288,8 @@ arch perm_magic_portal name The Mazes of Menace name_pl The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 28 y 9 end diff --git a/brest/black_shield/ground b/brest/black_shield/ground index 500be2014..e3b0371df 100644 --- a/brest/black_shield/ground +++ b/brest/black_shield/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch grass @@ -5371,6 +5371,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/brest/black_shield/upper b/brest/black_shield/upper index 23acfae97..3b5982ec7 100644 --- a/brest/black_shield/upper +++ b/brest/black_shield/upper @@ -7,7 +7,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch woodfloor @@ -3167,8 +3167,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/darcap/castle/castle2.1 b/darcap/castle/castle2.1 index 355a42806..9086a393b 100644 --- a/darcap/castle/castle2.1 +++ b/darcap/castle/castle2.1 @@ -8,7 +8,7 @@ enter_x 24 enter_y 47 msg Created: 1994-02-19 -Modified: 2008-12-21 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch grass @@ -6438,6 +6438,8 @@ y 27 end arch stair_down slaying castle2.0 +hp -1 +sp -1 x 26 y 27 end diff --git a/darcap/darcap/guilds/poisoned_dagger/ground b/darcap/darcap/guilds/poisoned_dagger/ground index 730d010d3..7996d1613 100644 --- a/darcap/darcap/guilds/poisoned_dagger/ground +++ b/darcap/darcap/guilds/poisoned_dagger/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch grass @@ -5360,6 +5360,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/darcap/darcap/guilds/poisoned_dagger/upper b/darcap/darcap/guilds/poisoned_dagger/upper index 45b52105d..b5076fbc6 100644 --- a/darcap/darcap/guilds/poisoned_dagger/upper +++ b/darcap/darcap/guilds/poisoned_dagger/upper @@ -7,7 +7,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch woodfloor @@ -3167,8 +3167,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/darcap/darcap/guilds/smoking_cauldron/ground b/darcap/darcap/guilds/smoking_cauldron/ground index 30e047f3f..4e8cd7a23 100644 --- a/darcap/darcap/guilds/smoking_cauldron/ground +++ b/darcap/darcap/guilds/smoking_cauldron/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch grass @@ -5360,6 +5360,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/darcap/darcap/guilds/smoking_cauldron/upper b/darcap/darcap/guilds/smoking_cauldron/upper index 18c40abe6..131780aa7 100644 --- a/darcap/darcap/guilds/smoking_cauldron/upper +++ b/darcap/darcap/guilds/smoking_cauldron/upper @@ -7,7 +7,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-22 Andreas Kirschbaum endmsg end arch woodfloor @@ -3167,8 +3167,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/navar_city/dreaming_sage/ground b/navar_city/dreaming_sage/ground index 4a61fe5ea..d6f883d07 100644 --- a/navar_city/dreaming_sage/ground +++ b/navar_city/dreaming_sage/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -5369,6 +5369,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/navar_city/dreaming_sage/upper b/navar_city/dreaming_sage/upper index effefae12..6dfcf6f97 100644 --- a/navar_city/dreaming_sage/upper +++ b/navar_city/dreaming_sage/upper @@ -8,7 +8,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -3168,8 +3168,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/pup_land/guilds/laughing_skull/ground b/pup_land/guilds/laughing_skull/ground index 47aa3f55f..ba7372b91 100644 --- a/pup_land/guilds/laughing_skull/ground +++ b/pup_land/guilds/laughing_skull/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -5371,6 +5371,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/pup_land/guilds/laughing_skull/upper b/pup_land/guilds/laughing_skull/upper index 9ac791494..7b0c2a959 100644 --- a/pup_land/guilds/laughing_skull/upper +++ b/pup_land/guilds/laughing_skull/upper @@ -8,7 +8,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -3168,8 +3168,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/pup_land/guilds/purple_butterfly/ground b/pup_land/guilds/purple_butterfly/ground index f1be547e6..ea1f61efc 100644 --- a/pup_land/guilds/purple_butterfly/ground +++ b/pup_land/guilds/purple_butterfly/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -5371,6 +5371,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/pup_land/guilds/purple_butterfly/upper b/pup_land/guilds/purple_butterfly/upper index 73add09c8..447d3288c 100644 --- a/pup_land/guilds/purple_butterfly/upper +++ b/pup_land/guilds/purple_butterfly/upper @@ -8,7 +8,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -3168,8 +3168,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/pup_land/nurnberg/city b/pup_land/nurnberg/city index 9278e497f..0abe6d4a5 100644 --- a/pup_land/nurnberg/city +++ b/pup_land/nurnberg/city @@ -8,7 +8,7 @@ msg Created: 1996-02-07 Updated 2007.11.12 by Gene Alexander - make this an outdoor map for day/night/weather -Modified: 2008-12-04 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg outdoor 1 end @@ -2693,6 +2693,8 @@ end arch guild name Guild of the Laughing Skull slaying ../guilds/laughing_skull/ground +hp -1 +sp -1 x 16 y 9 move_block 0 diff --git a/quests/peterm/Nethack_in_crossfire_entrance b/quests/peterm/Nethack_in_crossfire_entrance index 44955acde..4da769286 100644 --- a/quests/peterm/Nethack_in_crossfire_entrance +++ b/quests/peterm/Nethack_in_crossfire_entrance @@ -7,7 +7,7 @@ enter_x 2 enter_y 1 msg Created: 2001-05-06 -Modified: 2008-09-23 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -116,6 +116,8 @@ y 1 end arch exit slaying /world/world_104_115 +hp -1 +sp -1 x 1 y 1 end diff --git a/santo_dominion/guilds/drunken_barbarian/ground b/santo_dominion/guilds/drunken_barbarian/ground index 8d9d5ea4b..62e4173ab 100644 --- a/santo_dominion/guilds/drunken_barbarian/ground +++ b/santo_dominion/guilds/drunken_barbarian/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -5371,6 +5371,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/santo_dominion/guilds/drunken_barbarian/upper b/santo_dominion/guilds/drunken_barbarian/upper index 12812c2b0..009b73b96 100644 --- a/santo_dominion/guilds/drunken_barbarian/upper +++ b/santo_dominion/guilds/drunken_barbarian/upper @@ -7,7 +7,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -3167,8 +3167,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/santo_dominion/lord_byron/1st_floor b/santo_dominion/lord_byron/1st_floor index d233b098e..920bd714d 100644 --- a/santo_dominion/lord_byron/1st_floor +++ b/santo_dominion/lord_byron/1st_floor @@ -7,7 +7,7 @@ height 40 enter_x 20 enter_y 5 msg -Modified: 2008-10-25 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -1520,6 +1520,8 @@ y 34 end arch exit slaying main +hp -1 +sp -1 x 5 y 34 end @@ -3745,6 +3747,8 @@ y 22 end arch exit slaying main +hp -1 +sp -1 x 14 y 23 end @@ -9387,6 +9391,8 @@ y 36 end arch exit slaying main +hp -1 +sp -1 x 35 y 36 end diff --git a/santo_dominion/lord_byron/main b/santo_dominion/lord_byron/main index 1cc9a3318..cac9540ba 100644 --- a/santo_dominion/lord_byron/main +++ b/santo_dominion/lord_byron/main @@ -8,7 +8,7 @@ height 60 enter_x 25 enter_y 58 msg -Modified: 2009-01-23 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch sea @@ -6844,6 +6844,8 @@ y 25 end arch stair2_down slaying dungeon +hp -1 +sp -1 x 23 y 25 end @@ -7358,6 +7360,8 @@ y 10 end arch stair2_down slaying dungeon +hp -1 +sp -1 x 25 y 10 end @@ -8037,6 +8041,8 @@ y 25 end arch stair2_down slaying dungeon +hp -1 +sp -1 x 27 y 25 end diff --git a/scorn/guilds/mailed_fist/ground b/scorn/guilds/mailed_fist/ground index 140044113..e80d946b2 100644 --- a/scorn/guilds/mailed_fist/ground +++ b/scorn/guilds/mailed_fist/ground @@ -9,7 +9,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -5371,6 +5371,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/scorn/guilds/mailed_fist/upper b/scorn/guilds/mailed_fist/upper index 4144953e5..09eb80497 100644 --- a/scorn/guilds/mailed_fist/upper +++ b/scorn/guilds/mailed_fist/upper @@ -8,7 +8,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -3168,8 +3168,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/templates/guild/secondfloor b/templates/guild/secondfloor index 7e2fd5e4f..ecd2f5ab8 100644 --- a/templates/guild/secondfloor +++ b/templates/guild/secondfloor @@ -10,6 +10,7 @@ Creator: majorwoo josh@woosworld.net Date: 11/19/2004 Map finised by: Alestan jehloq@yahoo.com Date: 8/27/2007 +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch dungeon_magic @@ -4159,8 +4160,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 walk_on 0 diff --git a/unlinked/Greyshield/Cavern2 b/unlinked/Greyshield/Cavern2 index 2ad990a6c..f84fc40a4 100644 --- a/unlinked/Greyshield/Cavern2 +++ b/unlinked/Greyshield/Cavern2 @@ -6,6 +6,7 @@ enter_x 15 enter_y 18 msg Created: 1996-09-13 Chris Jeske +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch blocked @@ -2799,6 +2800,8 @@ y 9 end arch teleporter slaying Island +hp -1 +sp -1 x 21 y 9 end diff --git a/unlinked/Greyshield/Ruins b/unlinked/Greyshield/Ruins index e6614f3c9..edf8e637a 100644 --- a/unlinked/Greyshield/Ruins +++ b/unlinked/Greyshield/Ruins @@ -6,6 +6,7 @@ enter_x 6 enter_y 1 msg Created: 1996-11-01 Chris Jeske +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -2973,6 +2974,8 @@ y 19 end arch teleporter slaying ../../city/city +hp -1 +sp -1 x 29 end arch sign diff --git a/unlinked/kandora/cave/cave1 b/unlinked/kandora/cave/cave1 index f8ab60bfe..515de9d07 100644 --- a/unlinked/kandora/cave/cave1 +++ b/unlinked/kandora/cave/cave1 @@ -5,7 +5,7 @@ height 14 enter_x 1 msg Created: 1999-02-28 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch dungeon_floor @@ -1069,6 +1069,8 @@ slaying cave2 msg scorching hot air wafts from below. endmsg +hp -1 +sp -1 x 9 y 5 end diff --git a/unlinked/kandora/cave/cave2 b/unlinked/kandora/cave/cave2 index aefc218ab..8e0a0a9b7 100644 --- a/unlinked/kandora/cave/cave2 +++ b/unlinked/kandora/cave/cave2 @@ -5,7 +5,7 @@ height 14 enter_x 1 msg Created: 1999-02-28 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch permanent_lava @@ -1312,6 +1312,8 @@ y 11 end arch chole_1 slaying cave3 +hp -1 +sp -1 x 18 y 12 end diff --git a/unlinked/kandora/circus/mp_s b/unlinked/kandora/circus/mp_s index 59686d3f4..b316fb54a 100644 --- a/unlinked/kandora/circus/mp_s +++ b/unlinked/kandora/circus/mp_s @@ -4,7 +4,7 @@ width 15 height 13 msg Created: 1999-02-15 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch goldfloor @@ -14,6 +14,8 @@ y 1 end arch oakdoor slaying ../../town2 +hp -1 +sp -1 y 1 end arch goldfloor diff --git a/unlinked/kandora/circus/mp_world b/unlinked/kandora/circus/mp_world index 4bc02e739..e22c3b0d1 100644 --- a/unlinked/kandora/circus/mp_world +++ b/unlinked/kandora/circus/mp_world @@ -6,7 +6,7 @@ enter_x 39 enter_y 39 msg Created: 1999-02-18 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch desert @@ -429,6 +429,8 @@ end arch castle name swamp castle, with tower slaying mp_castle +hp -1 +sp -1 x 2 y 13 end @@ -804,6 +806,8 @@ x 4 end arch mountain_cave slaying mp_cave +hp -1 +sp -1 x 4 y 1 end @@ -947,6 +951,8 @@ end arch tavern name a fancy establishment slaying mp_tavern +hp -1 +sp -1 x 4 y 23 end @@ -5145,6 +5151,8 @@ end arch cathedral name A house of God slaying mp_church +hp -1 +sp -1 x 25 y 22 end @@ -7809,6 +7817,8 @@ end arch store_general name pet shop slaying petshop +hp -1 +sp -1 x 37 y 7 end diff --git a/unlinked/kandora/dd_alchemy b/unlinked/kandora/dd_alchemy index 15bfc2ae8..5e16435ba 100644 --- a/unlinked/kandora/dd_alchemy +++ b/unlinked/kandora/dd_alchemy @@ -6,7 +6,7 @@ enter_x 16 enter_y 8 msg Created: 1999-02-28 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -213,6 +213,8 @@ y 15 end arch stair_3_down slaying dd_alchemy2 +hp -1 +sp -1 x 1 y 15 end diff --git a/unlinked/kandora/denray b/unlinked/kandora/denray index 6b655fed2..1323cb25c 100644 --- a/unlinked/kandora/denray +++ b/unlinked/kandora/denray @@ -5,7 +5,7 @@ height 16 enter_x 15 msg Created: 1999-02-03 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch cobblestones2 @@ -170,6 +170,8 @@ y 7 end arch keep slaying dd_keep +hp -1 +sp -1 x 1 y 7 end @@ -482,6 +484,8 @@ y 13 end arch store_weapons slaying dd_shop +hp -1 +sp -1 x 4 y 13 end @@ -529,6 +533,8 @@ y 4 end arch church slaying dd_church +hp -1 +sp -1 x 5 y 4 end @@ -660,6 +666,8 @@ y 13 end arch guild slaying dd_alchemy +hp -1 +sp -1 x 6 y 13 end @@ -799,6 +807,8 @@ y 5 end arch inn slaying dd_inn +hp -1 +sp -1 x 8 y 5 end @@ -887,6 +897,8 @@ y 4 end arch tavern slaying dd_tavern +hp -1 +sp -1 x 9 y 4 end @@ -944,6 +956,8 @@ y 14 end arch market1 slaying dd_market +hp -1 +sp -1 x 9 y 14 end @@ -1056,6 +1070,8 @@ y 14 end arch market2 slaying dd_market +hp -1 +sp -1 x 10 y 14 end @@ -1201,6 +1217,8 @@ y 14 end arch market3 slaying dd_market +hp -1 +sp -1 x 11 y 14 end diff --git a/unlinked/kandora/dm_keep b/unlinked/kandora/dm_keep index 172d9a9f6..333fbec7a 100644 --- a/unlinked/kandora/dm_keep +++ b/unlinked/kandora/dm_keep @@ -6,7 +6,7 @@ enter_x 7 enter_y 14 msg Created: 1999-02-28 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch flagstone @@ -1080,6 +1080,8 @@ y 2 end arch stair_down_4 slaying dm_cellar +hp -1 +sp -1 x 11 y 2 end diff --git a/unlinked/kandora/dun_marksel b/unlinked/kandora/dun_marksel index a6e743d9a..c89e993c0 100644 --- a/unlinked/kandora/dun_marksel +++ b/unlinked/kandora/dun_marksel @@ -7,6 +7,7 @@ height 16 enter_x 15 msg Created: 1999-02-27 King Zoobus +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch brush @@ -234,6 +235,8 @@ y 8 end arch city_tower slaying dm_wizard +hp -1 +sp -1 x 2 y 8 end @@ -576,6 +579,8 @@ y 8 end arch store_general slaying dm_shop +hp -1 +sp -1 x 6 y 8 end @@ -593,6 +598,8 @@ y 11 end arch inn slaying dm_inn +hp -1 +sp -1 x 6 y 11 end @@ -1176,6 +1183,8 @@ y 10 end arch church slaying dm_church +hp -1 +sp -1 x 12 y 10 end @@ -1193,6 +1202,8 @@ y 13 end arch keep slaying dm_keep +hp -1 +sp -1 x 12 y 13 end @@ -1861,6 +1872,8 @@ y 6 end arch tavern slaying dm_tavern +hp -1 +sp -1 x 20 y 6 end diff --git a/unlinked/kandora/elcyon/old_temple b/unlinked/kandora/elcyon/old_temple index cc84bb935..632ae1525 100644 --- a/unlinked/kandora/elcyon/old_temple +++ b/unlinked/kandora/elcyon/old_temple @@ -5,6 +5,7 @@ height 16 enter_x 15 msg Created: 1999-02-03 King Zoobus +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch jungle_2 @@ -831,6 +832,8 @@ connected 40 end arch teleporter slaying fall +hp -1 +sp -1 x 10 y 4 speed 0.000000 diff --git a/unlinked/kandora/elcyon/seacity b/unlinked/kandora/elcyon/seacity index 9e21c853f..66ddb786d 100644 --- a/unlinked/kandora/elcyon/seacity +++ b/unlinked/kandora/elcyon/seacity @@ -6,7 +6,7 @@ enter_x 1 enter_y 1 msg Created: 1999-02-06 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -515,6 +515,8 @@ end arch rl_house1 name Dwarven Embassy slaying dwarf +hp -1 +sp -1 x 6 y 7 end @@ -1095,6 +1097,8 @@ end arch barrack_up name inn by the plaza slaying plaza +hp -1 +sp -1 x 12 y 9 end diff --git a/unlinked/kandora/kandora b/unlinked/kandora/kandora index 73c67f76a..1b2996266 100644 --- a/unlinked/kandora/kandora +++ b/unlinked/kandora/kandora @@ -4,7 +4,7 @@ width 40 height 28 msg Created: 1999-02-26 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woods @@ -26,6 +26,8 @@ y 5 end arch stronghold_sym slaying dun_marksel +hp -1 +sp -1 y 5 end arch woods @@ -73,6 +75,8 @@ end arch fort name Dun Denray slaying denray +hp -1 +sp -1 y 17 end arch grassmedium @@ -307,6 +311,8 @@ end arch tower_tob name signal tower slaying signal +hp -1 +sp -1 x 2 y 9 end @@ -831,6 +837,8 @@ y 2 end arch mountain_cave2 slaying cave/entrance +hp -1 +sp -1 x 6 y 2 end @@ -1569,6 +1577,8 @@ y 18 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 11 y 18 end @@ -1590,6 +1600,8 @@ y 22 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 11 y 22 end @@ -1698,6 +1710,8 @@ y 17 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 12 y 17 end @@ -1719,6 +1733,8 @@ y 21 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 12 y 21 end @@ -1740,6 +1756,8 @@ y 25 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 12 y 25 end @@ -1836,6 +1854,8 @@ y 19 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 13 y 19 end @@ -1845,6 +1865,8 @@ y 20 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 13 y 20 end @@ -1862,6 +1884,8 @@ y 23 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 13 y 23 end @@ -1879,6 +1903,8 @@ y 26 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 13 y 26 end @@ -2136,6 +2162,8 @@ y 27 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 15 y 27 end @@ -2244,6 +2272,8 @@ y 24 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 16 y 24 end @@ -2253,6 +2283,8 @@ y 25 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 16 y 25 end @@ -2262,6 +2294,8 @@ y 26 end arch invis_exit slaying ambush1 +hp -1 +sp -1 x 16 y 26 end diff --git a/unlinked/kandora/signal b/unlinked/kandora/signal index 0959e3d4b..5fd014dcc 100644 --- a/unlinked/kandora/signal +++ b/unlinked/kandora/signal @@ -5,7 +5,7 @@ height 14 enter_x 1 msg Created: 1999-02-28 King Zoobus -Modified: 2008-06-03 Arvid Norlander +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch cobblestones2 @@ -641,6 +641,8 @@ y 7 end arch stair_3_up slaying signal2 +hp -1 +sp -1 x 6 y 7 end diff --git a/unlinked/kandora/signal2 b/unlinked/kandora/signal2 index 51a57ed0d..02aa247e4 100644 --- a/unlinked/kandora/signal2 +++ b/unlinked/kandora/signal2 @@ -8,7 +8,7 @@ enter_x 6 enter_y 6 msg Created: 1999-02-28 King Zoobus -Modified: 2007-11-04 Andreas Kirschbaum +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch afloor_right @@ -593,6 +593,8 @@ y 5 end arch stair2_up slaying signal3 +hp -1 +sp -1 x 6 y 5 end diff --git a/wolfsburg/guilds/damned_heretics/ground b/wolfsburg/guilds/damned_heretics/ground index a314712ef..c4b8e6ff2 100644 --- a/wolfsburg/guilds/damned_heretics/ground +++ b/wolfsburg/guilds/damned_heretics/ground @@ -8,7 +8,7 @@ enter_x 12 enter_y 23 msg Created: 2002-01-10 -Modified: 2008-11-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch grass @@ -5371,6 +5371,8 @@ connected 40 end arch stair2_up slaying upper +hp -1 +sp -1 x 24 y 14 end diff --git a/wolfsburg/guilds/damned_heretics/upper b/wolfsburg/guilds/damned_heretics/upper index 8b89feae0..ba1fae0f0 100644 --- a/wolfsburg/guilds/damned_heretics/upper +++ b/wolfsburg/guilds/damned_heretics/upper @@ -7,7 +7,7 @@ enter_x 12 enter_y 11 msg Created: 2002-01-11 -Modified: 2008-10-20 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch woodfloor @@ -3167,8 +3167,8 @@ end arch perm_magic_portal name The Mazes of Menace slaying /quests/peterm/Nethack_in_crossfire_entrance -hp 0 -sp 0 +hp -1 +sp -1 x 18 y 9 end diff --git a/wolfsburg/slave_pit2 b/wolfsburg/slave_pit2 index 7f3fea85c..8169ab4ad 100644 --- a/wolfsburg/slave_pit2 +++ b/wolfsburg/slave_pit2 @@ -7,7 +7,7 @@ height 25 enter_x 2 enter_y 1 msg -Modified: 2008-10-25 Rick Tanner +Modified: 2009-10-23 Andreas Kirschbaum endmsg end arch blocked @@ -4486,6 +4486,8 @@ arch chole_1 name pit slaying snakepit face hole.111 +hp -1 +sp -1 x 32 y 9 end diff --git a/world/world_105_115 b/world/world_105_115 index 0717183bd..c62c8adca 100644 --- a/world/world_105_115 +++ b/world/world_105_115 @@ -9,7 +9,7 @@ enter_x 1 enter_y 1 msg Created: 2001-02-16 -Modified: 2009-07-12 Andreas Kirschbaum +Modified: 2009-10-23 Andreas Kirschbaum endmsg outdoor 1 tile_path_1 world_105_114 @@ -12112,6 +12112,8 @@ y 37 end arch wagon slaying /none +hp -1 +sp -1 x 30 y 37 speed 1 diff --git a/world/world_129_109 b/world/world_129_109 index 0217e2fd7..cb1205a7c 100644 --- a/world/world_129_109 +++ b/world/world_129_109 @@ -4,7 +4,7 @@ region wolfsburg width 50 height 50 msg -Modified: 2007-12-24 tchize +Modified: 2009-10-23 Andreas Kirschbaum endmsg outdoor 1 tile_path_1 world_129_108 @@ -1717,6 +1717,8 @@ y 9 end arch big_galleon slaying /wolfsburg/dungeons/ship +hp -1 +sp -1 x 7 y 9 end