Test consolidation

diff --git a/tests/backfail.chk b/tests/backfail.chk
deleted file mode 100644 (file)
index 8adf3a9..0000000
--- a/tests/backfail.chk
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Welcome to Adventure!!  Would you like instructions?
-
-> n
-
-You are standing at the end of a road before a small brick building.
-Around you is a forest.  A small stream flows out of the building and
-down a gully.
-
-> back
-
-You can't get there from here.
-
-You're in front of building.
-
-
-You scored 32 out of a possible 430, using 1 turn.
-
-You are obviously a rank amateur.  Better luck next time.
-
-To achieve the next higher rating, you need 14 more points.

diff --git a/tests/backfail.log b/tests/backfail.log
deleted file mode 100644 (file)
index 7f0b865..0000000
--- a/tests/backfail.log
+++ /dev/null
@@ -1,3 +0,0 @@
-## Go back more times than you ought to be able to
-n
-back

diff --git a/tests/bigfail.chk b/tests/bigfail.chk
index 2a2c1cab9da6d1bd42c811797070665d5c453ff9..0e59251cc6502f1168efcaa64189989ca78d8663 100644 (file)
--- a/tests/bigfail.chk
+++ b/tests/bigfail.chk
@@ -1306,18 +1306,10 @@ the floor with a thick pile carpet.  Moss covers the ceiling.
 
 A small velvet pillow lies on the floor.
 
 
 A small velvet pillow lies on the floor.
 

-> take pillow
-
-OK
-

 > w
 
 You're in Swiss Cheese Room.
 
 > w
 
 You're in Swiss Cheese Room.
 

-> drop axe
-
-OK
-

 > ne
 
 You're in Bedquilt.
 > ne
 
 You're in Bedquilt.


@@ -1430,7 +1422,7 @@ There is food here.
 
 > drop pillow
 
 
 > drop pillow
 

-OK
+I see no pillow here.

 
 > drop trident
 
 
 > drop trident
 


@@ -1526,8 +1518,6 @@ You're in Bedquilt.
 
 You're in Swiss Cheese Room.
 
 
 You're in Swiss Cheese Room.
 

-There is a little axe here.
-

 > w
 
 You're at east end of Twopit Room.
 > w
 
 You're at east end of Twopit Room.


@@ -1576,7 +1566,7 @@ The way north leads through a massive, rusty, iron door.
 
 > take bottle
 
 
 > take bottle
 

-OK
+You can't carry anything more.  You'll have to drop something first.

 
 > n
 
 
 > n
 


@@ -1812,8 +1802,6 @@ There is an emerald here the size of a plover's egg!
 
 There is a jewel-encrusted trident here!
 
 
 There is a jewel-encrusted trident here!
 

-A small velvet pillow lies on the floor.
-

 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!
 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!


@@ -1858,8 +1846,6 @@ There is an emerald here the size of a plover's egg!
 
 There is a jewel-encrusted trident here!
 
 
 There is a jewel-encrusted trident here!
 

-A small velvet pillow lies on the floor.
-

 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!
 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!


@@ -1906,7 +1892,7 @@ You're in sloping corridor.
 
 You're on sw side of chasm.
 
 
 You're on sw side of chasm.
 

-There is an empty bottle here.
+There is a little axe here.

 
 There are many coins here!
 
 
 There are many coins here!
 


@@ -1925,7 +1911,7 @@ There is no longer any way across the chasm.
 
 You're on sw side of chasm.
 
 
 You're on sw side of chasm.
 

-There is an empty bottle here.
+There is a little axe here.

 
 There are many coins here!
 
 
 There are many coins here!
 


@@ -1950,6 +1936,10 @@ For crying out loud, the poor thing is already dead!
 
 OK
 
 
 OK
 

+> take axe
+
+OK
+

 > sw
 
 You're in sloping corridor.
 > sw
 
 You're in sloping corridor.


@@ -1968,8 +1958,6 @@ The floor is littered with worthless shards of pottery.
 
 You're in Swiss Cheese Room.
 
 
 You're in Swiss Cheese Room.
 

-There is a little axe here.
-

 > ne
 
 You are in Bedquilt, a long east/west passage with holes everywhere.
 > ne
 
 You are in Bedquilt, a long east/west passage with holes everywhere.


@@ -2099,23 +2087,23 @@ OK
 
 > z
 
 
 > z
 

-Your lamp is getting dim.  You'd best go back for those batteries.
-

 OK
 
 > z
 
 OK
 
 > z
 

+Your lamp is getting dim.  You'd best go back for those batteries.
+

 OK
 
 > z
 
 OK
 
 > z
 

-Tsk!  A wizard wouldn't have to take 350 turns.  This is going to cost
-you a couple of points.
-

 OK
 
 > s
 
 OK
 
 > s
 

+Tsk!  A wizard wouldn't have to take 350 turns.  This is going to cost
+you a couple of points.
+

 Dead end
 
 There are fresh batteries here.
 Dead end
 
 There are fresh batteries here.


@@ -2174,64 +2162,92 @@ You're on west bank of fissure.
 
 A crystal bridge spans the fissure.
 
 
 A crystal bridge spans the fissure.
 

-> inven
+> w

 
 

-You are currently holding the following:
-Brass lantern
-Black rod
-Batteries
+You're at west end of Hall of Mists.
+
+> w
+
+You're at east end of long hall.
+
+> n
+
+You are at a crossover of a high n/s passage and a low e/w one.

 
 > e
 
 
 > e
 

-You're on east bank of fissure.
+You're in the west side chamber.

 
 

-A crystal bridge spans the fissure.
+> d
+
+There is no way to go that direction.
+
+You're in the west side chamber.

 
 > e
 
 
 > e
 

+You're in Hall of Mt King.
+
+> u
+

 There is a threatening little dwarf in the room with you!
 
 There is a threatening little dwarf in the room with you!
 

-One sharp nasty knife is thrown at you!
+You're in Hall of Mists.

 
 

-It gets you!
+Rough stone steps lead up the dome.

 
 

-You clumsy oaf, you've done it again!  I don''t know how long I can
-keep this up.  Do you want me to try reincarnating you again?
+> throw axe

 
 

-> y
+You killed a little dwarf.

 
 

-Okay, now where did I put my orange smoke?....  >POOF!<
-Everything disappears in a dense cloud of orange smoke.
+You are at one end of a vast hall stretching forward out of sight to
+the west.  There are openings to either side.  Nearby, a wide stone
+staircase leads downward.  The hall is filled with wisps of white mist
+swaying to and fro almost as if alive.  A cold wind blows up the
+staircase.  There is a passage at the top of a dome behind you.

 
 

-You're inside building.
+There is a little axe here.

 
 

-There is a richly-carved ebony statuette here!
+Rough stone steps lead up the dome.

 
 

-There is an emerald here the size of a plover's egg!
+> take axe

 
 

-There is a jewel-encrusted trident here!
+OK

 
 

-A small velvet pillow lies on the floor.
+> d

 
 

-There is a platinum pyramid here, 8 inches on a side!
+You're in Hall of Mt King.

 
 

-There are diamonds here!
+> n

 
 

-There is an enormous ruby here!
+You're in n/s passage above e/w passage.

 
 

-There are bars of silver here!
+> d

 
 

-There is a persian rug spread out on the floor!
+You are in a dirty broken passage.  To the east is a crawl.  To the
+west is a large passage.  Above you is a hole to another passage.

 
 

-There is a large sparkling nugget of gold here!
+> e

 
 

-A precious jade necklace has been dropped here!
+You are on the brink of a small clean climbable pit.  A crawl leads
+west.

 
 

-There is precious jewelry here!
+> d
+
+You are in the bottom of a small pit with a little stream, which
+enters and exits through tiny slits.
+
+> listen
+
+The stream is gurgling placidly.
+
+> u
+
+You're at brink of small pit.

 
 
 
 

-You scored 207 out of a possible 430, using 365 turns.
+You scored 217 out of a possible 430, using 377 turns.

 
 You may now consider yourself a "Seasoned Adventurer".
 
 
 You may now consider yourself a "Seasoned Adventurer".
 

-To achieve the next higher rating, you need 44 more points.
+To achieve the next higher rating, you need 34 more points.

diff --git a/tests/defeat.chk b/tests/defeat.chk
index 344a2bf2bcac5d678fb74505243af4906d16b269..d21f2b86409c538e853095fbeaa151cf256beec1 100644 (file)
--- a/tests/defeat.chk
+++ b/tests/defeat.chk
@@ -2014,6 +2014,10 @@ OK
 
 OK
 
 
 OK
 

+> fly rug
+
+The rug does not appear inclined to cooperate.
+

 > drop emerald
 
 The gem fits easily into the cavity.
 > drop emerald
 
 The gem fits easily into the cavity.


@@ -2095,15 +2099,15 @@ You're at hill in road.
 
 > e
 
 
 > e
 

+Tsk!  A wizard wouldn't have to take 350 turns.  This is going to cost
+you a couple of points.
+

 You are standing at the end of a road before a small brick building.
 Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > in
 
 You are standing at the end of a road before a small brick building.
 Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > in
 

-Tsk!  A wizard wouldn't have to take 350 turns.  This is going to cost
-you a couple of points.
-

 You're inside building.
 
 There is a golden chain lying in a heap on the floor!
 You're inside building.
 
 There is a golden chain lying in a heap on the floor!


@@ -3015,7 +3019,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!
 
 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 479 turns.
+You scored 399 out of a possible 430, using 480 turns.

 
 Your score puts you in Master Adventurer Class B.
 
 
 Your score puts you in Master Adventurer Class B.
 

diff --git a/tests/defeat.log b/tests/defeat.log
index 687e5c8c667dfaf1f0f1dc7aee3302600572264b..8d90d68a707d0b769dc7886ed772a4fdcdf4aff5 100644 (file)
--- a/tests/defeat.log
+++ b/tests/defeat.log
@@ -340,6 +340,8 @@ light urn
 rub urn
 take amber
 drop rug
 rub urn
 take amber
 drop rug

+# fly rug before dropping emerald, triggering RUG_NOTHING1
+fly rug

 drop emerald
 fly rug
 take sapphire
 drop emerald
 fly rug
 take sapphire

diff --git a/tests/flyrug.chk b/tests/flyrug.chk
deleted file mode 100644 (file)
index cdce73b..0000000
--- a/tests/flyrug.chk
+++ /dev/null
@@ -1,229 +0,0 @@
-
-Welcome to Adventure!!  Would you like instructions?
-
-> n
-
-You are standing at the end of a road before a small brick building.
-Around you is a forest.  A small stream flows out of the building and
-down a gully.
-
-> seed 1495951709
-Seed set to 1495951709
-
-You're in front of building.
-
-> in
-
-You are inside a building, a well house for a large spring.
-
-There are some keys on the ground here.
-
-There is a shiny brass lamp nearby.
-
-There is food here.
-
-There is a bottle of water here.
-
-> take lamp
-
-OK
-
-> on
-
-Your lamp is now on.
-
-> xyzzy
-
->>Foof!<<
-
-You are in a debris room filled with stuff washed in from the surface.
-A low wide passage with cobbles becomes plugged with mud and debris
-here, but an awkward canyon leads upward and west.  In the mud someone
-has scrawled, "MAGIC WORD XYZZY".
-
-A three foot black rod with a rusty star on an end lies nearby.
-
-> take rod
-
-OK
-
-> e
-
-You are crawling over cobbles in a low passage.  There is a dim light
-at the east end of the passage.
-
-There is a small wicker cage discarded nearby.
-
-> take cage
-
-OK
-
-> w
-
-You're in debris room.
-
-> w
-
-You are in an awkward sloping east/west canyon.
-
-> w
-
-You are in a splendid chamber thirty feet high.  The walls are frozen
-rivers of orange stone.  An awkward canyon and a good passage exit
-from east and west sides of the chamber.
-
-A cheerful little bird is sitting here singing.
-
-> drop rod
-
-OK
-
-> take bird
-
-OK
-
-> take rod
-
-OK
-
-> w
-
-At your feet is a small pit breathing traces of white mist.  An east
-passage ends here except for a small crack leading on.
-
-Rough stone steps lead down the pit.
-
-> free bird
-
-OK
-
-> wave rod
-
-The bird flies about agitatedly for a moment, then disappears through
-the crack.  It reappears shortly, carrying in its beak a jade
-necklace, which it drops at your feet.
-
-> take jade
-
-OK
-
-> drop rod
-
-OK
-
-> take bird
-
-OK
-
-> take rod
-
-OK
-
-> d
-
-You are at one end of a vast hall stretching forward out of sight to
-the west.  There are openings to either side.  Nearby, a wide stone
-staircase leads downward.  The hall is filled with wisps of white mist
-swaying to and fro almost as if alive.  A cold wind blows up the
-staircase.  There is a passage at the top of a dome behind you.
-
-Rough stone steps lead up the dome.
-
-> w
-
-You are on the east bank of a fissure slicing clear across the hall.
-The mist is quite thick here, and the fissure is too wide to jump.
-
-> wave rod
-
-The bird flies agitatedly about the cage.
-
-A crystal bridge now spans the fissure.
-
-> drop rod
-
-OK
-
-> e
-
-You're in Hall of Mists.
-
-Rough stone steps lead up the dome.
-
-> n
-
-You are in the Hall of the Mountain King, with passages off in all
-directions.
-
-A huge green fierce snake bars the way!
-
-> free bird
-
-The little bird attacks the green snake, and in an astounding flurry
-drives the snake away.
-
-> take bird
-
-OK
-
-> s
-
-You are in the south side chamber.
-
-There is precious jewelry here!
-
-> take jewelry
-
-OK
-
-> n
-
-You're in Hall of Mt King.
-
-> sw
-
-You are in a secret canyon which here runs e/w.  It crosses over a
-very tight canyon 15 feet below.  If you go down you may not be able
-to get back up.
-
-> w
-
-You are in a secret canyon which exits to the north and east.
-
-A huge green fierce dragon bars the way!
-
-The dragon is sprawled out on a persian rug!!
-
-> kill dragon
-
-With what?  Your bare hands?
-
-> yes
-
-Congratulations!  You have just vanquished a dragon with your bare
-hands!  (Unbelievable, isn't it?)
-
-You are in a secret canyon which exits to the north and east.
-
-There is a persian rug spread out on the floor!
-
-The blood-specked body of a huge green dead dragon lies to one side.
-
-> drink blood
-
-Your head buzzes strangely for a moment.
-
-> take rug
-
-OK
-
-> fly rug
-
-The rug does not appear inclined to cooperate.
-
-
-You scored 63 out of a possible 430, using 37 turns.
-
-Your score qualifies you as a novice class adventurer.
-
-To achieve the next higher rating, you need 58 more points.

diff --git a/tests/flyrug.log b/tests/flyrug.log
deleted file mode 100644 (file)
index a0f685f..0000000
--- a/tests/flyrug.log
+++ /dev/null
@@ -1,41 +0,0 @@
-## Transitive fly rug test
-n
-seed 1495951709
-in
-take lamp
-on
-xyzzy
-take rod
-e
-take cage
-w
-w
-w
-drop rod
-take bird
-take rod
-w
-free bird
-wave rod
-take jade
-drop rod
-take bird
-take rod
-d
-w
-wave rod
-drop rod
-e
-n
-free bird
-take bird
-s
-take jewelry
-n
-sw
-w
-kill dragon
-yes
-drink blood
-take rug
-fly rug

diff --git a/tests/illformed.chk b/tests/illformed.chk
index c3020bba755fb6150c8421e368eaa9fa072008bd..13eb9b4e3cc535b5d12449fc9d248d6cc4d735cd 100644 (file)
--- a/tests/illformed.chk
+++ b/tests/illformed.chk
@@ -31,8 +31,14 @@ You are standing at the end of a road before a small brick building.
 Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 Around you is a forest.  A small stream flows out of the building and
 down a gully.
 

-> seed 1801426495
-Seed set to 1801426495
+> seed 1635997320
+Seed set to 1635997320
+
+You're in front of building.
+
+> back
+
+You can't get there from here.

 
 You're in front of building.
 
 
 You're in front of building.
 


@@ -141,6 +147,26 @@ There is food here.
 
 There is a bottle of water here.
 
 
 There is a bottle of water here.
 

+> say F'UNJ
+
+Nothing happens.
+
+> say fee
+
+I don't know how.
+
+> say fie
+
+I don't know how.
+
+> say foe
+
+I don't know how.
+
+> say fum
+
+I don't know how.
+

 > in
 
 I don't know in from out here.  Use compass points or name something
 > in
 
 I don't know in from out here.  Use compass points or name something


@@ -233,7 +259,9 @@ There is a bottle of water here.
 
 > out
 
 
 > out
 

-You're in front of building.
+You are standing at the end of a road before a small brick building.
+Around you is a forest.  A small stream flows out of the building and
+down a gully.

 
 > stream
 
 
 > stream
 


@@ -254,9 +282,7 @@ Blasting requires dynamite.
 
 > building
 
 
 > building
 

-You are standing at the end of a road before a small brick building.
-Around you is a forest.  A small stream flows out of the building and
-down a gully.
+You're in front of building.

 
 > cave
 
 
 > cave
 


@@ -609,7 +635,7 @@ Okay, "boo".
 
 > score
 
 
 > score
 

-You have garnered 27 out of a possible 430 points, using 105 turns.
+You have garnered 27 out of a possible 430 points, using 111 turns.

 
 > z
 
 
 > z
 


@@ -617,7 +643,7 @@ OK
 
 > score
 
 
 > score
 

-You have garnered 27 out of a possible 430 points, using 107 turns.
+You have garnered 27 out of a possible 430 points, using 113 turns.

 
 > quit keys
 
 
 > quit keys
 


@@ -666,7 +692,7 @@ Do you really want to quit now?
 
 OK
 
 
 OK
 

-You scored 27 out of a possible 430, using 115 turns.
+You scored 27 out of a possible 430, using 121 turns.

 
 You are obviously a rank amateur.  Better luck next time.
 
 
 You are obviously a rank amateur.  Better luck next time.
 

diff --git a/tests/illformed.log b/tests/illformed.log
index 65d49cc047df38665abf1d60d8d7096ccebcfea3..ce80ae97b6b82184e20cd445dc7342d12b42f0dc 100644 (file)
--- a/tests/illformed.log
+++ b/tests/illformed.log
@@ -2,7 +2,8 @@
 foo
 
 y
 foo
 
 y

-seed 1801426495
+seed 1635997320
+back

 version
 help
 info
 version
 help
 info


@@ -11,6 +12,13 @@ back
 eat grate
 eat building
 in
 eat grate
 eat building
 in

+# Z'ZZZ Word correct, but does nothing
+say F'UNJ
+# Say bigwords when giant isn't around
+say fee
+say fie
+say foe
+say fum

 in
 throw food
 nothing food
 in
 throw food
 nothing food

diff --git a/tests/magicword.chk b/tests/magicword.chk
deleted file mode 100644 (file)
index a2da921..0000000
--- a/tests/magicword.chk
+++ /dev/null
@@ -1,68 +0,0 @@
-
-Welcome to Adventure!!  Would you like instructions?
-
-> n
-
-You are standing at the end of a road before a small brick building.
-Around you is a forest.  A small stream flows out of the building and
-down a gully.
-
-> seed 1635997320
-Seed set to 1635997320
-
-You're in front of building.
-
-> in
-
-You are inside a building, a well house for a large spring.
-
-There are some keys on the ground here.
-
-There is a shiny brass lamp nearby.
-
-There is food here.
-
-There is a bottle of water here.
-
-> say F'UNJ
-
-Nothing happens.
-
-> say fee
-
-I don't know how.
-
-> say fie
-
-I don't know how.
-
-> say foe
-
-I don't know how.
-
-> say fum
-
-I don't know how.
-
-> say fee
-
-I don't know how.
-
-> say fie
-
-I don't know how.
-
-> say foe
-
-I don't know how.
-
-> say fum
-
-I don't know how.
-
-
-You scored 32 out of a possible 430, using 10 turns.
-
-You are obviously a rank amateur.  Better luck next time.
-
-To achieve the next higher rating, you need 14 more points.

diff --git a/tests/magicword.log b/tests/magicword.log
deleted file mode 100644 (file)
index 24f6ee5..0000000
--- a/tests/magicword.log
+++ /dev/null
@@ -1,13 +0,0 @@
-## Say magic word at beginning to improve test coverage
-n
-seed 1635997320
-in
-say F'UNJ
-say fee
-say fie
-say foe
-say fum
-say fee
-say fie
-say foe
-say fum