From 8984e48e78c8e83df9c93d6e34c0d8e1cfabc2b5 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sun, 10 Jan 2021 22:14:11 -0500 Subject: [PATCH] Attempting fix for issue #50: carried clam can be opened (with trident) --- NEWS | 2 +- actions.c | 2 ++ adventure.yaml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f18db51..1368f1b 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ = Open Adventure project news = 1.9: 2020-08-27:: - Update the dungeon maker to avoid a deprecation die to security issues + Update the dungeon maker to avoid a deprecation due to security issues 1.8: 2019-04-19:: Minor typo and capitalization glitches in user-visible text fixed & documented. diff --git a/actions.c b/actions.c index 5460848..f38f9e5 100644 --- a/actions.c +++ b/actions.c @@ -998,6 +998,8 @@ static phase_codes_t lock(verb_t verb, obj_t obj) case CLAM: if (verb == LOCK) rspeak(HUH_MAN); + else if (TOTING(CLAM)) + rspeak(DROP_CLAM); else if (!TOTING(TRIDENT)) rspeak(CLAM_OPENER); else { diff --git a/adventure.yaml b/adventure.yaml index aed2a4f..34008a4 100644 --- a/adventure.yaml +++ b/adventure.yaml @@ -2762,7 +2762,7 @@ arbitrary_messages: !!omap You'd best take inventory and drop something. - CLAM_BLOCKER: 'You can''t fit this five-foot clam through that little passage!' - OYSTER_BLOCKER: 'You can''t fit this five-foot oyster through that little passage!' -#- DROP_CLAM: 'I advise you to put down the clam before opening it. >STRAIN!<' +- DROP_CLAM: 'I advise you to put down the clam before opening it. >STRAIN!<' - DROP_OYSTER: 'I advise you to put down the oyster before opening it. >WRENCH!<' - CLAM_OPENER: 'You don''t have anything strong enough to open the clam.' - OYSTER_OPENER: 'You don''t have anything strong enough to open the oyster.' -- 2.31.1