X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=tests%2Fdefeat.log;h=fb29fc3b8028eb9277b47da317c14b65772892a7;hp=2c5a68556f916372c0727aecece355de44172b3a;hb=7ba34df7396e5b814ecd171505ef0f4ce95b5206;hpb=516980dc6e2851b435884fb17d8d41ec8bcb752e

diff --git a/tests/defeat.log b/tests/defeat.log
index 2c5a685..fb29fc3 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,7 +219,7 @@ throw axe
 take axe
 e
 take pillow
-w
+west
 drop axe
 ne
 e
@@ -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
@@ -243,7 +244,7 @@ plugh
 on
 s
 d
-w
+west
 d
 n
 d
@@ -252,18 +253,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 +283,8 @@ e
 take spices
 drop keys
 fork
-w
-w
+west
+west
 sw
 free bear
 inven
@@ -292,17 +293,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 +312,7 @@ take eggs
 s
 d
 u
-w
+west
 u
 s
 e
@@ -328,7 +329,7 @@ take rug
 take ruby
 take emerald
 out
-w
+west
 n
 n
 n
@@ -341,12 +342,14 @@ drop rug
 drop emerald
 fly rug
 take sapphire
-fly rug
+fly
 take emerald
 drop ruby
 take rug
 drop bottle
 take ruby
+drop emerald
+take emerald
 e
 s
 e
@@ -362,9 +365,9 @@ on
 s
 s
 u
-w
-w
-w
+west
+west
+west
 s
 e
 s
@@ -391,9 +394,10 @@ plugh
 on
 s
 d
-w
+west
 d
 e
+read sign
 take magazine
 e
 drop magazine
@@ -466,7 +470,12 @@ e
 e
 e
 sw
+# We want the xyzzy and plugh words to fail here
+xyzzy
+plugh
+read sign
+carry sign
 take rod
 drop rod
 ne
-blast
+blast rod