Test consolidation.

diff --git a/tests/breakvase.chk b/tests/breakvase.chk
index 012d7f39b2e2e13cc1e7e17d53fd59a40243ff1e..df38a1c9eb42e058230b17fc634a9b7c628207f2 100644 (file)
--- a/tests/breakvase.chk
+++ b/tests/breakvase.chk
@@ -1298,8 +1298,15 @@ OK
 
 You have taken the vase and hurled it delicately to the ground.
 
+> quit
 
-You scored 139 out of a possible 430, using 210 turns.
+Do you really want to quit now?
+
+> yes
+
+OK
+
+You scored 139 out of a possible 430, using 211 turns.
 
 You have achieved the rating: "Experienced Adventurer".
 

diff --git a/tests/breakvase.log b/tests/breakvase.log
index 85e0fd8d99b64960f727af8a4431f82f79994f46..1db995711e47842e1a6867094b76794282435030 100644 (file)
--- a/tests/breakvase.log
+++ b/tests/breakvase.log
@@ -216,3 +216,5 @@ s
 # Previous was just setup - this is the real test 
 take vase
 break vase
+quit
+yes

diff --git a/tests/defeat.chk b/tests/defeat.chk
index 7e51c2d7fa9cd5bb852112ee1a30671971ef202a..a9de41e1c298544f65f2d94698072f7b862e3a43 100644 (file)
--- a/tests/defeat.chk
+++ b/tests/defeat.chk
@@ -1397,13 +1397,13 @@ There are some keys on the ground here.
 
 There is food here.
 
-> drop pillow
+> drop vase
 
-OK
+The ming vase drops with a delicate crash.
 
-> drop vase
+> drop pillow
 
-The vase is now resting, delicately, on a velvet pillow.
+OK
 
 > drop trident
 
@@ -1898,10 +1898,10 @@ There is an emerald here the size of a plover's egg!
 
 There is a jewel-encrusted trident here!
 
-There is a delicate, precious, ming vase here!
-
 A small velvet pillow lies on the floor.
 
+The floor is littered with worthless shards of pottery.
+
 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!
@@ -2099,10 +2099,10 @@ There is a richly-carved ebony statuette here!
 
 There is a jewel-encrusted trident here!
 
-There is a delicate, precious, ming vase here!
-
 A small velvet pillow lies on the floor.
 
+The floor is littered with worthless shards of pottery.
+
 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!
@@ -2163,10 +2163,10 @@ There is a richly-carved ebony statuette here!
 
 There is a jewel-encrusted trident here!
 
-There is a delicate, precious, ming vase here!
-
 A small velvet pillow lies on the floor.
 
+The floor is littered with worthless shards of pottery.
+
 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!
@@ -2353,10 +2353,10 @@ There is a richly-carved ebony statuette here!
 
 There is a jewel-encrusted trident here!
 
-There is a delicate, precious, ming vase here!
-
 A small velvet pillow lies on the floor.
 
+The floor is littered with worthless shards of pottery.
+
 There is a platinum pyramid here, 8 inches on a side!
 
 There are diamonds here!
@@ -2944,8 +2944,8 @@ 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 413 out of a possible 430, using 468 turns.
+You scored 399 out of a possible 430, using 468 turns.
 
-Your score puts you in Master Adventurer Class A.
+Your score puts you in Master Adventurer Class B.
 
-To achieve the next higher rating, you need 14 more points.
+To achieve the next higher rating, you need 12 more points.

diff --git a/tests/defeat.log b/tests/defeat.log
index ab2c2672700606d66053d5aaa4f34d4fd54dfc2f..d0497e76a7a864ec27eced2d40340e4b737ef0f3 100644 (file)
--- a/tests/defeat.log
+++ b/tests/defeat.log
@@ -1,4 +1,4 @@
-## Last-minute defeat, with lava
+## Last-minute defeat, with lava. Also tests vase drop before pillow.
 # Based on walkthrough at http://www.ecsoftwareconsulting.com/node/56
 n
 seed 1838473132
@@ -232,8 +232,9 @@ u
 n
 off
 plugh
-drop pillow
+# Invert these so we test the vase-drop code
 drop vase
+drop pillow
 drop trident
 drop emerald
 drop ebony

diff --git a/tests/quit.chk b/tests/quit.chk
deleted file mode 100644 (file)
index 76d2215..0000000
--- a/tests/quit.chk
+++ /dev/null
@@ -1,22 +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.
-
-> quit
-
-Do you really want to quit now?
-
-> yes
-
-OK
-
-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/quit.log b/tests/quit.log
deleted file mode 100644 (file)
index f0cad3a..0000000
--- a/tests/quit.log
+++ /dev/null
@@ -1,4 +0,0 @@
-## Simple quit
-n
-quit
-yes