Test consolidation.

tests/bearbridge.chk

@@ -1331,12 +1331,40 @@ up.  A low hands and knees passage enters from the south.
 
 There is an enormous clam here with its shell tightly closed.
 
+> take clam
+
+OK
+
+> s
+
+You can't fit this five-foot clam through that little passage!
+
+You're in Shell Room.
+
+> drop clam
+
+OK
+
 > open clam
 
 A glistening pearl falls out of the clam and rolls away.  Goodness,
 this must really be an oyster.  (I never was very good at identifying
 bivalves.)  Whatever it is, it has now snapped shut again.
 
+> take oyster
+
+OK
+
+> s
+
+You can't fit this five-foot oyster through that little passage!
+
+You're in Shell Room.
+
+> drop oyster
+
+OK
+
 > s
 
 You're at complex junction.
@@ -1358,6 +1386,8 @@ You're in n/s passage above e/w passage.
 
 You're at "Y2".
 
+A hollow voice says "PLUGH".
+
 > off
 
 Your lamp is now off.
@@ -1426,16 +1456,12 @@ OK
 
 It is now pitch dark.  If you proceed you will likely fall into a pit.
 
-A hollow voice says "PLUGH".
-
 > on
 
 Your lamp is now on.
 
 You're at "Y2".
 
-A hollow voice says "PLUGH".
-
 > s
 
 You're in n/s passage above e/w passage.
@@ -1969,7 +1995,7 @@ There is no way across the fissure.
 You're on east bank of fissure.
 
 
-You scored 243 out of a possible 430, using 319 turns.
+You scored 243 out of a possible 430, using 325 turns.
 
 You may now consider yourself a "Seasoned Adventurer".
 

tests/bearbridge.log

@@ -1,4 +1,4 @@
-## Bear collapses bridge
+## Bear collapses bridge; also test bivalve predicates and unbridged fissure. 
 n
 seed 1838473132
 in
@@ -223,8 +223,16 @@ drop axe
 ne
 e
 n
-open clam
+# Here we are at the Shell Room
+take clam
 s
+drop clam
+open clam
+take oyster
+s
+drop oyster
+s
+# OK, bivalve-carry test is done
 u
 e
 u
@@ -269,6 +277,7 @@ u
 toss eggs
 ne
 ne
+# Bear-verb test
 barren
 in
 attack

tests/bivalve.log

@@ -1,233 +0,0 @@
-## Attempt to carry bivalves
-# Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
-n
-seed 1838473132
-in
-take lamp
-xyzzy
-on
-take rod
-e
-take cage
-w
-w
-w
-drop rod
-take bird
-take rod
-w
-free bird
-wave rod
-take necklace
-drop rod
-take bird
-take rod
-d
-d
-free bird
-drop rod
-drop cage
-take cage
-take bird
-w
-take coins
-e
-s
-take jewelry
-n
-up
-s
-take gold
-n
-d
-n
-n
-plugh
-extinguish lamp
-drop coins
-drop jewelry
-drop necklace
-drop gold
-plugh
-on
-s
-take silver
-s
-sw
-take axe
-w
-kill dragon
-yes
-drink blood
-take rug
-e
-e
-up
-d
-n
-n
-off
-plugh
-inven
-drop rug
-drop silver
-out
-s
-w
-n
-take appendage
-free bird
-drop cage
-listen
-s
-s
-n
-in
-take water
-plugh
-on
-plover
-ne
-take pyramid
-s
-plover
-s
-s
-take rod
-up
-w
-wave rod
-drop rod
-west
-take diamonds
-w
-w
-w
-s
-sw
-se
-s
-kill machine
-s
-s
-kill ogre
-n
-take ruby
-s
-w
-n
-n
-n
-nw
-d
-e
-e
-e
-e
-e
-throw axe
-take axe
-n
-n
-n
-off
-plugh
-drop ruby
-drop diamonds
-drop pyramid
-plugh
-on
-s
-s
-u
-n
-n
-d
-bedquilt
-throw axe
-take axe
-slab
-s
-d
-water plant
-u
-w
-u
-reservoir
-H'CFL
-n
-n
-nw
-u
-u
-u
-u
-ne
-take ebony
-sw
-d
-d
-d
-d
-d
-take water
-s
-s
-s
-s
-d
-s
-d
-water plant
-u
-drop appendage
-e
-d
-get oil
-
-u
-w
-d
-climb
-w
-n
-oil door
-drop bottle
-n
-take trident
-w
-d
-se
-n
-w
-drop trident
-drop ebony
-drop axe
-drop lantern
-e
-take emerald
-w
-take lamp
-take axe
-take ebony
-take trident
-nw
-s
-take vase
-se
-throw axe
-take axe
-e
-take pillow
-w
-drop axe
-ne
-e
-n
-# Here we are at the Shell Room
-take clam
-s
-drop clam
-open clam
-take oyster
-s