X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=tests%2Fdefeat.log;h=8d90d68a707d0b769dc7886ed772a4fdcdf4aff5;hp=0b89954772e3d7f778e4162f90c4fd64cc65661c;hb=ea3b4567154359795ef32bd7b9d8cfb62aa3117c;hpb=9e1143e780e2526366f439fc7089097bb4bf8d1d

diff --git a/tests/defeat.log b/tests/defeat.log
index 0b89954..8d90d68 100644
--- 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
@@ -9,13 +9,13 @@ on
 take rod
 e
 take cage
-w
-w
-w
+go west
+go west
+go west
 drop rod
 take bird
 take rod
-w
+go west
 free bird
 wave rod
 take necklace
@@ -29,7 +29,7 @@ drop rod
 drop cage
 take cage
 take bird
-w
+go west
 take coins
 e
 s
@@ -55,7 +55,7 @@ take silver
 s
 sw
 take axe
-w
+go west
 kill dragon
 yes
 drink blood
@@ -73,7 +73,7 @@ drop rug
 drop silver
 out
 s
-w
+go west
 n
 take appendage
 free bird
@@ -95,14 +95,14 @@ s
 s
 take rod
 up
-w
+go west
 wave rod
 drop rod
 west
 take diamonds
-w
-w
-w
+go west
+go west
+go west
 s
 sw
 se
@@ -114,7 +114,7 @@ kill ogre
 n
 take ruby
 s
-w
+west
 n
 n
 n
@@ -151,10 +151,10 @@ s
 d
 water plant
 u
-w
+west
 u
 reservoir
-H'CFL
+say H'CFL
 n
 n
 nw
@@ -186,27 +186,27 @@ d
 get oil
 
 u
-w
+west
 d
 climb
-w
+west
 n
 oil door
 drop bottle
 n
 take trident
-w
+west
 d
 se
 n
-w
+west
 drop trident
 drop ebony
 drop axe
 drop lantern
 e
 take emerald
-w
+west
 take lamp
 take axe
 take ebony
@@ -219,12 +219,13 @@ throw axe
 take axe
 e
 take pillow
-w
+west
 drop axe
 ne
 e
 n
 open clam
+open oyster
 s
 u
 e
@@ -232,8 +233,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
@@ -243,7 +245,7 @@ plugh
 on
 s
 d
-w
+west
 d
 n
 d
@@ -252,18 +254,18 @@ take pearl
 u
 u
 s
-w
-w
-w
-w
+west
+west
+west
+west
 d
 climb
-w
+west
 get eggs
 n
 take bottle
 n
-w
+west
 d
 sw
 u
@@ -282,8 +284,8 @@ e
 take spices
 drop keys
 fork
-w
-w
+west
+west
 sw
 free bear
 inven
@@ -292,17 +294,17 @@ sw
 d
 se
 se
-w
+west
 d
 get oil
 up
 e
 take axe
-w
-w
+west
+west
 d
 climb
-w
+west
 fee
 fie
 foe
@@ -311,7 +313,7 @@ take eggs
 s
 d
 u
-w
+west
 u
 s
 e
@@ -328,7 +330,7 @@ take rug
 take ruby
 take emerald
 out
-w
+west
 n
 n
 n
@@ -338,6 +340,8 @@ light urn
 rub urn
 take amber
 drop rug
+# fly rug before dropping emerald, triggering RUG_NOTHING1
+fly rug
 drop emerald
 fly rug
 take sapphire
@@ -347,6 +351,8 @@ drop ruby
 take rug
 drop bottle
 take ruby
+drop emerald
+take emerald
 e
 s
 e
@@ -362,9 +368,9 @@ on
 s
 s
 u
-w
-w
-w
+west
+west
+west
 s
 e
 s
@@ -391,12 +397,14 @@ plugh
 on
 s
 d
-w
+west
 d
 e
+read sign
 take magazine
 e
 drop magazine
+w
 e
 e
 e
@@ -464,9 +472,21 @@ 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
+plugh
+read sign
+carry sign
 take rod
 drop rod
+# look to see dropped rod on ground. Different state than
+# before we picked it up.
+look
 ne
-blast
+listen
+blast rod