More test cleanup to converge with advent430 branch.

tests/carrybird.chk

@@ -51,10 +51,6 @@ has scrawled, "MAGIC WORD XYZZY".
 
 A three foot black rod with a rusty star on an end lies nearby.
 
-> eat grate
-
-I see no grate here.
-
 > w
 
 You are in an awkward sloping east/west canyon.
@@ -76,7 +72,7 @@ You can catch the bird, but you cannot carry it.
 The little bird is now dead.  Its body disappears.
 
 > 
-You scored 32 out of a possible 430, using 10 turns.
+You scored 32 out of a possible 430, using 9 turns.
 
 You are obviously a rank amateur.  Better luck next time.
 

tests/carrybird.log

@@ -6,9 +6,8 @@ take lamp
 rub lamp
 xyzzy
 on
-eat grate
 w
 w
 take bird
 # test intransitive attack on bird
-attack
+attack

tests/dwarf_alternative.chk

@@ -58,4 +58,12 @@ Oh dear, you seem to have gotten yourself killed.  I might be able to
 help you out, but I've never really done this before.  Do you want me
 to try to reincarnate you?
 
-> 
+> n
+
+OK
+
+You scored 51 out of a possible 430, using 7 turns.
+
+Your score qualifies you as a novice class adventurer.
+
+To achieve the next higher rating, you need 70 more points.

tests/dwarf_alternative.log

@@ -8,3 +8,4 @@ w
 w
 d
 d
+n

tests/flyback.log

@@ -1,4 +1,5 @@
 ## Test fix for issue #51: rug flying is broken
+#NOCOMPARE Behavior differs due to a bug fix.
 n
 seed 1838473132
 in

tests/hint_urn.log

@@ -1,4 +1,5 @@
 ## Elicit hint for dealing with urn (fuzzed)
+#NOCOMPARE Policy decision - no point in emulating advent430's extra \n here
 n
 seed 1495951709
 u
@@ -13,4 +14,4 @@ z
 z
 z
 y
-y
+y

tests/hint_witt.log

@@ -1,4 +1,5 @@
 ## Hint for Witt's End
+#NOCOMPARE Policy decision - no point in emulating advent430's extra \n here
 n
 seed 1635997320
 in

tests/lampdim2.log

@@ -426,4 +426,4 @@ n
 s
 n
 s
-lamp on
+lamp on

tests/lampdim3.log

@@ -432,4 +432,4 @@ n
 s
 n
 up
-down
+down

tests/lockchain.chk

@@ -1888,4 +1888,12 @@ Oh dear, you seem to have gotten yourself killed.  I might be able to
 help you out, but I've never really done this before.  Do you want me
 to try to reincarnate you?
 
-> 
+> n
+
+OK
+
+You scored 219 out of a possible 430, using 328 turns.
+
+You may now consider yourself a "Seasoned Adventurer".
+
+To achieve the next higher rating, you need 32 more points.

tests/lockchain.log

@@ -334,3 +334,4 @@ s
 listen
 n
 jump
+n

tests/ogre_no_dwarves.log

@@ -23,4 +23,4 @@ s
 kill machine
 s
 s
-attack
+attack

tests/reach_ledge_short.log

@@ -238,4 +238,4 @@ take amber
 drop rug
 drop emera
 fly
-e
+e