From fbc447ef994028b69b33db4f261012b2afa90fc6 Mon Sep 17 00:00:00 2001 From: anmaster Date: Fri, 20 Jun 2008 09:32:36 +0000 Subject: [PATCH] In /scorn: Fix some invalid key string warnings from gridarta. Move a magic ear under floor. Remove a pointless check_inv. git-svn-id: svn://svn.code.sf.net/p/crossfire/code/maps/trunk@9338 282e977c-c81d-0410-88c4-b93c2d0d6712 --- scorn/misc/HospitalityRoom | 9 +++++---- scorn/peterm/undead_quest | 4 +++- scorn/shops/scorn.sale2 | 6 ++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/scorn/misc/HospitalityRoom b/scorn/misc/HospitalityRoom index 6c03988ad..a32f8234d 100644 --- a/scorn/misc/HospitalityRoom +++ b/scorn/misc/HospitalityRoom @@ -8,6 +8,7 @@ width 35 height 16 msg Created: 2000-02-16 +Modified: 2008-06-20 Arvid Norlander endmsg end arch woodfloor2 @@ -4863,10 +4864,6 @@ x 33 y 7 connected 80 end -arch woodfloor2 -x 33 -y 8 -end arch magic_ear msg @match shazam @@ -4876,6 +4873,10 @@ x 33 y 8 connected 6684 end +arch woodfloor2 +x 33 +y 8 +end arch longtable_2_1_1 x 33 y 8 diff --git a/scorn/peterm/undead_quest b/scorn/peterm/undead_quest index 8bbc17760..76f3a43fa 100644 --- a/scorn/peterm/undead_quest +++ b/scorn/peterm/undead_quest @@ -8,7 +8,7 @@ enter_x 23 enter_y 19 msg Created: 2000-06-05 -Modified: 2008-03-24 Nicolas Weeger +Modified: 2008-06-20 Arvid Norlander endmsg maplore @quest Scorn Royalty Quest @@ -745,6 +745,7 @@ x 5 y 4 end arch locked_door1 +slaying no_key x 5 y 4 end @@ -1462,6 +1463,7 @@ x 9 y 18 end arch locked_door1 +slaying no_key x 9 y 18 end diff --git a/scorn/shops/scorn.sale2 b/scorn/shops/scorn.sale2 index dff6c3c38..dc38e553c 100644 --- a/scorn/shops/scorn.sale2 +++ b/scorn/shops/scorn.sale2 @@ -9,6 +9,7 @@ enter_y 2 msg Created: Gene Alexander (gene@eracc.com) Using ideas of: Andreas Vogl (red.blaze@gmx.net) +Modified: 2008-06-20 Arvid Norlander endmsg end arch shop_empty @@ -1118,10 +1119,6 @@ arch dwall_2_1_2 x 5 y 1 end -arch check_inv -x 5 -y 2 -end arch dungeon_magic x 5 y 2 @@ -3367,6 +3364,7 @@ sleep 0 arch key2 name Oorgh key name_pl Oorgh keys +slaying Oorgh key end end arch shop_empty