Partially address GitLab issue #27: arbitrary_messages unreachable

diff --git a/actions.c b/actions.c
index be822c8083493c44c4201c29933620fd9e3eb632..46d09e1e8a84d7ee134c95aacf05bcd5485b7668 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -995,7 +995,7 @@ static int lock(verb_t verb, obj_t obj)
         if (verb == LOCK)
             rspeak(HUH_MAN);
         else if (!TOTING(TRIDENT))
-            rspeak(OYSTER_OPENER);
+            rspeak(CLAM_OPENER);
         else {
             DESTROY(CLAM);
             drop(OYSTER, game.loc);
@@ -1006,8 +1006,12 @@ static int lock(verb_t verb, obj_t obj)
     case OYSTER:
         if (verb == LOCK)
             rspeak(HUH_MAN);
-        else
+       else if (TOTING(OYSTER))
+           rspeak(DROP_OYSTER);
+        else if (!TOTING(TRIDENT))
             rspeak(OYSTER_OPENER);
+       else
+           rspeak(OYSTER_OPENS);
         break;
     case DOOR:
         rspeak((game.prop[DOOR] == DOOR_UNRUSTED) ? OK_MAN : RUSTY_DOOR);

diff --git a/adventure.yaml b/adventure.yaml
index 742a4c394124f784180178b122505c96142d6a9a..d67535ee77fb9b2ffd8840795ac5394623836805 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -2666,7 +2666,7 @@ arbitrary_messages:  !!omap
 - DWARF_SINGLE: 'There is a threatening little dwarf in the room with you!'
 - KNIFE_THROWN: 'One sharp nasty knife is thrown at you!'
 - SAYS_PLUGH: 'A hollow voice says "PLUGH".'
-- GETS_YOU: 'It gets you!'
+#- GETS_YOU: 'It gets you!'
 - MISSES_YOU: 'It misses!'
 - UNSURE_FACING: 'I am unsure how you are facing.  Use compass points or nearby objects.'
 - NO_INOUT_HERE: |-
@@ -2761,7 +2761,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.'

diff --git a/tests/breakmirror.chk b/tests/breakmirror.chk
index a875555820f8d00fe9e4775aa7650eb5b1d39c0c..709c3529804f5bc215a319bdeb99efdc0b93d867 100644 (file)
--- a/tests/breakmirror.chk
+++ b/tests/breakmirror.chk
@@ -2935,7 +2935,7 @@ Huh?
 
 > unlock oyster
 
-You don't have anything strong enough to open the oyster.
+I advise you to put down the oyster before opening it.  >WRENCH!<
 
 > drop oyster
 

diff --git a/tests/defeat.chk b/tests/defeat.chk
index acbfc1f870905058cc5dc0eef7ddc5ea906cf8cf..dca937ae7149d93eec1d810720fc3f4aeb36bf44 100644 (file)
--- a/tests/defeat.chk
+++ b/tests/defeat.chk
@@ -2914,11 +2914,20 @@ not disturb the dwarves!"  An immense mirror is hanging against one
 wall, and stretches to the other end of the room, where various other
 sundry objects can be glimpsed dimly in the distance.
 
-> e
+> take oyster
 
-There is no way to go that direction.
+OK
 
-You're at ne end.
+Interesting.  There seems to be something written on the underside of
+the oyster.
+
+> drop oyster
+
+OK
+
+> open oyster
+
+You don't have anything strong enough to open the oyster.
 
 > sw
 
@@ -2969,6 +2978,8 @@ OK
 
 You're at ne end.
 
+There is an enormous oyster here with its shell tightly closed.
+
 > listen
 
 You can hear the murmuring of the beanstalks and the snoring of the
@@ -2980,7 +2991,7 @@ There is a loud explosion, and a twenty-foot hole appears in the far
 wall, burying the snakes in the rubble.  A river of molten lava pours
 in through the hole, destroying everything in its path, including you!
 
-You scored 399 out of a possible 430, using 474 turns.
+You scored 399 out of a possible 430, using 476 turns.
 
 Your score puts you in Master Adventurer Class B.
 

diff --git a/tests/defeat.log b/tests/defeat.log
index a4296670db84be9aac1a505ce9af36971fc09865..c1e1ab94a09ed1670f4ae872f82b3923598d91b2 100644 (file)
--- a/tests/defeat.log
+++ b/tests/defeat.log
@@ -468,7 +468,10 @@ e
 e
 e
 e
-e
+# Expecting failure here
+take oyster
+drop oyster
+open oyster
 sw
 # We want the xyzzy and plugh words to fail here
 xyzzy

diff --git a/tests/notrident.chk b/tests/notrident.chk
index 2882617ec248cc42dba297aa68edfd991dde919c..3a87662056b953c18f0db8b64b8155c2a18ad119 100644 (file)
--- a/tests/notrident.chk
+++ b/tests/notrident.chk
@@ -1271,7 +1271,7 @@ There is an enormous clam here with its shell tightly closed.
 
 > open clam
 
-You don't have anything strong enough to open the oyster.
+You don't have anything strong enough to open the clam.
 
 
 You scored 179 out of a possible 430, using 216 turns.