Attempting fix for issue #50: carried clam can be opened (with trident)

diff --git a/NEWS b/NEWS
index f18db5110a85f838f200532ece6007c5b687281d..1368f1b9516fca35de4535f37e76146a1382dd2a 100644 (file)
--- 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 5460848f95a93d7c10fa3f80fe82d8032eae251c..f38f9e5ad271f5dc9229b4a544e68a3c6c43ed5d 100644 (file)
--- 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 aed2a4f1951abe44319a23a0e730be9cf8bf7b6b..34008a4bd001061db59a5125ad1bc81bcaad19c4 100644 (file)
--- 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.'