Fix to Gitlab issue #32. Now SEED and WASTE are in adventure.yaml

NOTE: the tests are all updated because now, like every other action,
SEED and WASTE have a \n before their output, as they correctly use
SPEAK

diff --git a/actions.c b/actions.c
index 3990f8c839fe60f5028620848c849fd3bb2f62a2..0a67cf43c6866ee88fee11ee0443934ef8f74428 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -1244,6 +1244,26 @@ static int wake(verb_t verb, obj_t obj)
     }
 }
 
+static int seed(verb_t verb, const char *arg)
+/* Set seed */
+{
+    long seed = atol(arg);
+    speak(actions[verb].message, arg);
+    set_seed(seed);
+    --game.turns;
+    return GO_TOP;
+}
+
+static int waste(verb_t verb, turn_t turns)
+/* Burn turns */
+{
+    game.limit -= turns;
+    char newlim[1024];
+    sprintf(newlim, "%ld", (long)game.limit);
+    speak(actions[verb].message, newlim);
+    return GO_TOP;
+}
+
 static int wave(verb_t verb, obj_t obj)
 /* Wave.  No effect unless waving rod at fissure or at bird. */
 {
@@ -1430,6 +1450,10 @@ int action(struct command_t *command)
                 return listen();
             case PART:
                 return reservoir();
+            case SEED:
+            case WASTE:
+                rspeak(NUMERIC_REQUIRED);
+                return GO_TOP;
             default: // LCOV_EXCL_LINE
                 BUG(INTRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
             }
@@ -1531,6 +1555,10 @@ int action(struct command_t *command)
         }
         case PART:
             return reservoir();
+        case SEED:
+            return seed(command->verb, command->raw2);
+        case WASTE:
+            return waste(command->verb, (turn_t)atol(command->raw2));
         default: // LCOV_EXCL_LINE
             BUG(TRANSITIVE_ACTION_VERB_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
         }

diff --git a/advent.h b/advent.h
index a20c3dd15200ac3d51e5de3517d5509c8baad9cc..09ec71b7d16f9a82c1d9bf241687b4a58ab33950 100644 (file)
--- a/advent.h
+++ b/advent.h
@@ -87,7 +87,7 @@ enum termination {endgame, quitgame, scoregame};
 
 enum speechpart {unknown, intransitive, transitive};
 
-enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL};
+enum wordtype {NO_WORD_TYPE, MOTION, OBJECT, ACTION, SPECIAL, NUMERIC};
 
 typedef enum scorebonus {none, splatter, defeat, victory} score_t;
 

diff --git a/adventure.yaml b/adventure.yaml
index 4ee5cc78717a44ca22016a0bffd08562d263155a..8c940f85d8ba864eb48a8bc4d50145c5852bee76 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -3015,6 +3015,8 @@ arbitrary_messages:  !!omap
 - GO_UNNEEDED: |-
     You don't have to say "go" every time; just specify a direction or, if
     it's nearby, name the place to which you wish to move.
+- NUMERIC_REQUIRED:
+    This command requires a numeric argument. 
 
 classes: 
 - threshold: 0
@@ -3878,6 +3880,12 @@ actions: !!omap
 - PART:
     message: *nothing_happens
     words: ['z''zzz']
+- SEED:
+    message: 'Seed set to %s'
+    words: ['seed']
+- WASTE:
+    message: 'Game limit is now %s'
+    words: ['waste']
 - ACT_UNKNOWN:
     message: *huh_man
     words: !!null

diff --git a/main.c b/main.c
index faa353b514be4001c04d0506170d0e660fbc47ef..c837fe69bf0a3f9a58f14c1e6515e83bb06f11b2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -133,28 +133,6 @@ int main(int argc, char *argv[])
     terminate(quitgame);
 }
 
-static bool fallback_handler(struct command_t command)
-/* fallback handler for commands not handled by FORTRANish parser */
-{
-    long sv;
-    turn_t turnlimit;
-    char buf[DIM(command.raw1) + DIM(command.raw2) + 1];
-    sprintf(buf, "%s %s", command.raw1, command.raw2);
-
-    if (sscanf(buf, "seed %ld", &sv) == 1) {
-        set_seed(sv);
-        printf("Seed set to %ld\n", sv);
-        // autogenerated, so don't charge user time for it.
-        --game.turns;
-        return true;
-    } else if (sscanf(buf, "waste %ld", &turnlimit) == 1) {
-        game.limit -= turnlimit;
-        printf("Game limit is now %ld\n", game.limit);
-        return true;
-    }
-    return false;
-}
-
 /*  Check if this loc is eligible for any hints.  If been here long
  *  enough, display.  Ignore "HINTS" < 4 (special stuff, see database
  *  notes). */
@@ -1136,8 +1114,6 @@ Lookup:
                 rspeak(GO_UNNEEDED);
         }
         if (command.id1 == WORD_NOT_FOUND) {
-            if (fallback_handler(command))
-                continue;
             /* Gee, I don't understand. */
             sspeak(DONT_KNOW, command.raw1);
             goto Lclearobj;
@@ -1152,12 +1128,16 @@ Lookup:
             command.obj = command.id1;
             break;
         case ACTION:
-            command.part = intransitive;
+            if(command.type2 == NUMERIC) 
+                command.part = transitive;
+            else
+                command.part = intransitive;
             command.verb = command.id1;
             break;
         case SPECIAL:
             speak(specials[command.id1].message);
             goto Lclearobj;
+        case NUMERIC:
         default: // LCOV_EXCL_LINE
             BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
         }

diff --git a/misc.c b/misc.c
index 120a503351a0d899349d98c162dd7c0f35900866..2fe1363826eef89a4b85a76c0667a210cb6d936e 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -399,6 +399,30 @@ static int get_special_vocab_id(const char* word)
     return (WORD_NOT_FOUND);
 }
 
+static bool is_valid_int(const char *str) 
+/* Returns true if the string passed in is represents a valid integer, 
+ * that could then be parsed by atoi() */
+{
+    // Handle negative number
+    if (*str == '-')
+        ++str;
+
+    // Handle empty string or just "-"
+    if (!*str)
+        return false;
+
+    // Check for non-digit chars in the rest of the stirng.
+    while (*str)
+    {
+        if (!isdigit(*str))
+            return false;
+        else
+            ++str;
+    }
+
+    return true;
+}
+
 static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* type)
 {
     /* Check for an empty string */
@@ -445,6 +469,13 @@ static void get_vocab_metadata(const char* word, vocab_t* id, enum wordtype* typ
         return;
     }
 
+    // Check words that are actually numbers.
+    if (is_valid_int(word)) {
+        *id = WORD_EMPTY;
+        *type = NUMERIC;
+        return;
+    }
+
     *id = WORD_NOT_FOUND;
     *type = NO_WORD_TYPE;
     return;

diff --git a/tests/axebear.chk b/tests/axebear.chk
index 417c1f99d6486213bef8d731dbc31b76650ef486..4bd8d07cfce4ccc76b33641ee716f9687be8bfb5 100644 (file)
--- a/tests/axebear.chk
+++ b/tests/axebear.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/axeorama.chk b/tests/axeorama.chk
index a1b316f47fe452bd47c320dea53ca904b1ef56b7..f9bc8432a76a32fc1292833504f6911d310ecf1b 100644 (file)
--- a/tests/axeorama.chk
+++ b/tests/axeorama.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/barehands.chk b/tests/barehands.chk
index dad89bc2175a288b5f356998d81cf291658b36ae..b8bc9a77c4809a933fd32bbd032e0f3878f84bd7 100644 (file)
--- a/tests/barehands.chk
+++ b/tests/barehands.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/bigfail.chk b/tests/bigfail.chk
index bab7c6f0187fe4923ff7931d389e6a47f1c3e5f7..8a216dcd571fb34b03c0fdb3d014d2c610ab97d8 100644 (file)
--- a/tests/bigfail.chk
+++ b/tests/bigfail.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.
@@ -2512,6 +2513,7 @@ Brass lantern
 Dwarf's axe
 
 > waste 2443
+
 Game limit is now 30
 
 You're in Hall of Mists.

diff --git a/tests/birdsnakewake.chk b/tests/birdsnakewake.chk
index afcc84e8c41b8bcac385529bd1ac58e800a6114b..164211829cc50ac57cf44f2133d62e706a6aa6e1 100644 (file)
--- a/tests/birdsnakewake.chk
+++ b/tests/birdsnakewake.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/boulder2.chk b/tests/boulder2.chk
index 8f2f953d14111bcb6731fcf2c95f6955ed9e3240..08ee7b9f080262d7b2ce29b060d8181892c4eeab 100644 (file)
--- a/tests/boulder2.chk
+++ b/tests/boulder2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/breakmirror.chk b/tests/breakmirror.chk
index 709c3529804f5bc215a319bdeb99efdc0b93d867..8fb19108cc0032e6725b108e2008f483c5c21f61 100644 (file)
--- a/tests/breakmirror.chk
+++ b/tests/breakmirror.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/carrybird.chk b/tests/carrybird.chk
index 654577ac660006dd133e50bff5ae8523b2483184..7f3b931c30890b84467d8281c332e631c09de952 100644 (file)
--- a/tests/carrybird.chk
+++ b/tests/carrybird.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1071883378
+
 Seed set to 1071883378
 
 You're in front of building.

diff --git a/tests/carryfreebird.chk b/tests/carryfreebird.chk
index 87e24470300b54221e7846995e20969be39fcfc0..7d78c9ff17d96ff7d9ac8c0c56350b47a29e8465 100644 (file)
--- a/tests/carryfreebird.chk
+++ b/tests/carryfreebird.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/death-jump.chk b/tests/death-jump.chk
index 69bd3014751ccace98e5f79b2c5403048b7d7a78..5be6c0210c0811f443274d70b645ff713370cde0 100644 (file)
--- a/tests/death-jump.chk
+++ b/tests/death-jump.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1495774850
+
 Seed set to 1495774850
 
 You're in front of building.

diff --git a/tests/defeat.chk b/tests/defeat.chk
index d21f2b86409c538e853095fbeaa151cf256beec1..353acc0a38de0dff686f8484a1e75e4806fd4b4e 100644 (file)
--- a/tests/defeat.chk
+++ b/tests/defeat.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/domefail.chk b/tests/domefail.chk
index e3f301ce203be7747b5789382ccb0a3f2871bdcf..000995b96b6081598559cabf51456268abcaf963 100644 (file)
--- a/tests/domefail.chk
+++ b/tests/domefail.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/dragon_secret5.chk b/tests/dragon_secret5.chk
index 03c5d13c5f112c197d74cd2f3ec67e3a9799a17c..202b08e740b5e4c7a3d14174772a36babeb2144f 100644 (file)
--- a/tests/dragon_secret5.chk
+++ b/tests/dragon_secret5.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 18084731
+
 Seed set to 18084731
 
 You're in front of building.

diff --git a/tests/dropcagedbird.chk b/tests/dropcagedbird.chk
index 4836a4100fcda1b0673363232f194743fc8fdfdd..b5c64e68dca0e6eea217a53e2b8a17bd2092f0bb 100644 (file)
--- a/tests/dropcagedbird.chk
+++ b/tests/dropcagedbird.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/drown.chk b/tests/drown.chk
index c1f3319d1300acff9e05a57c548657fe349ddbe5..b581ef365840e866e41cbddb2281128e6d20a9a2 100644 (file)
--- a/tests/drown.chk
+++ b/tests/drown.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/dwarf.chk b/tests/dwarf.chk
index c189647c119f090a18efe9166d45f692dfdd51f4..47aec5e9cbc5a295224dd5d427fac082f3d11526 100644 (file)
--- a/tests/dwarf.chk
+++ b/tests/dwarf.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1494912171
+
 Seed set to 1494912171
 
 You're in front of building.

diff --git a/tests/dwarf_alternative.chk b/tests/dwarf_alternative.chk
index d45ef8c26cef3512e11ce80265796ff5e3b78ccc..5fcaf06251675151a259e50a078e723886a4c92d 100644 (file)
--- a/tests/dwarf_alternative.chk
+++ b/tests/dwarf_alternative.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 383847
+
 Seed set to 383847
 
 You're in front of building.

diff --git a/tests/eggs_done.chk b/tests/eggs_done.chk
index dad7c6b421386b2159ef835c5bd29cf83d632755..e8d9a50440343817c7aed65a266667b7af6ac37b 100644 (file)
--- a/tests/eggs_done.chk
+++ b/tests/eggs_done.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/eggs_vanish.chk b/tests/eggs_vanish.chk
index 52eb210bc6eab6aa84bfd1ae17ec84d8e0a0cbe0..5f84bfc0cb588ca234b37408362db36e71d01bd2 100644 (file)
--- a/tests/eggs_vanish.chk
+++ b/tests/eggs_vanish.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/endgame428.chk b/tests/endgame428.chk
index fa7e248dd8f18b946b06e8f80fe356e7477c966e..d79e4509833e340265614431468d1aeb2506c1a8 100644 (file)
--- a/tests/endgame428.chk
+++ b/tests/endgame428.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/fail_hint_maze.chk b/tests/fail_hint_maze.chk
index 2551f20d7cc68163306e23d30c9811b21f768504..9973218479c3492128108fb1bda9481ce9cf6248 100644 (file)
--- a/tests/fail_hint_maze.chk
+++ b/tests/fail_hint_maze.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 25508795
+
 Seed set to 25508795
 
 You're in front of building.

diff --git a/tests/fail_hint_ogre.chk b/tests/fail_hint_ogre.chk
index 7de57811fc4e9b2478757d7f42738b9b37af9334..b7d6952f75e137de937f8f7e2863fc255cdaf21c 100644 (file)
--- a/tests/fail_hint_ogre.chk
+++ b/tests/fail_hint_ogre.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/fail_hint_ogre2.chk b/tests/fail_hint_ogre2.chk
index 845df47d2faa0bee71c0d6a02b3c5857f26f0cb6..701dfec930279e1a7c29d040681d3391224546ef 100644 (file)
--- a/tests/fail_hint_ogre2.chk
+++ b/tests/fail_hint_ogre2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 25508795
+
 Seed set to 25508795
 
 You're in front of building.

diff --git a/tests/fillvase.chk b/tests/fillvase.chk
index 51e9b529d1670036e6a3d81678275ab4bbee601d..6f86288609bb66f08cac6688431e240b2e747bb1 100644 (file)
--- a/tests/fillvase.chk
+++ b/tests/fillvase.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/footslip.chk b/tests/footslip.chk
index 0be8983130fa36ef82ad31f11cf8803d12bef185..50abc40ec276d2ac0b23a1a7306fbc8577b54f59 100644 (file)
--- a/tests/footslip.chk
+++ b/tests/footslip.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/gemstates.chk b/tests/gemstates.chk
index 28d633d6fa8c7c428c8d38cadb5a874f015550a5..568ae1707e0d241977e548a87b6bcad2c221a60d 100644 (file)
--- a/tests/gemstates.chk
+++ b/tests/gemstates.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/hint_dark.chk b/tests/hint_dark.chk
index ba37865c33934ae590bc5428dbe41d20755002ae..cee6051050195f28f95ab2e8bee63fad2b34b261 100644 (file)
--- a/tests/hint_dark.chk
+++ b/tests/hint_dark.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/hint_grate.chk b/tests/hint_grate.chk
index 965be07aff99af7255bbc776b90f1b7fe54ed2bc..652b639a6b1b7214156f2dbd08416ca6ce2ba0b0 100644 (file)
--- a/tests/hint_grate.chk
+++ b/tests/hint_grate.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1495774850
+
 Seed set to 1495774850
 
 You're in front of building.

diff --git a/tests/hint_jade.chk b/tests/hint_jade.chk
index c59b24cbc812ece47acde1966ff6bcd6243ab0c6..b9bf99e310cb71e6255471cf8d39ad772099d230 100644 (file)
--- a/tests/hint_jade.chk
+++ b/tests/hint_jade.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/hint_snake.chk b/tests/hint_snake.chk
index 8dfcc8c1a3f48ab8f461b073cbba60fbe483dfa9..78ca80f114d94b17259344d0b4fce697383f59f5 100644 (file)
--- a/tests/hint_snake.chk
+++ b/tests/hint_snake.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1951269982
+
 Seed set to 1951269982
 
 You're in front of building.

diff --git a/tests/hint_urn.chk b/tests/hint_urn.chk
index 74a8ac690e64449f1772dabb0cb7f566f8b90d99..d51adc1d0f59be85189434d71032e51535c8b439 100644 (file)
--- a/tests/hint_urn.chk
+++ b/tests/hint_urn.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/hint_witt.chk b/tests/hint_witt.chk
index af20bc2099172a6b98a0a0f29636d4d36ef71372..919f0793ef493212d9fe9cb3529145c1de3544f4 100644 (file)
--- a/tests/hint_witt.chk
+++ b/tests/hint_witt.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/illformed.chk b/tests/illformed.chk
index 17d277c9c59756e3f99c5fdf1a75d8cdc9b08c02..35463958cc60d8aa4ab9b581951883308f9f367a 100644 (file)
--- a/tests/illformed.chk
+++ b/tests/illformed.chk
@@ -32,6 +32,7 @@ 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.
@@ -72,6 +73,20 @@ Sorry, but I no longer seem to remember how it was you got here.
 
 You're in front of building.
 
+> seed
+
+This command requires a numeric argument.
+
+You're in front of building.
+
+> waste
+
+This command requires a numeric argument.
+
+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.
+
 > eat grate
 
 I see no grate here.
@@ -236,9 +251,7 @@ Blasting requires dynamite.
 
 > 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
 
@@ -597,7 +610,7 @@ Okay, "boo".
 
 > score
 
-You have garnered 27 out of a possible 430 points, using 113 turns.
+You have garnered 27 out of a possible 430 points, using 115 turns.
 
 > z
 
@@ -605,7 +618,7 @@ OK
 
 > score
 
-You have garnered 27 out of a possible 430 points, using 115 turns.
+You have garnered 27 out of a possible 430 points, using 117 turns.
 
 > quit keys
 
@@ -654,7 +667,7 @@ Do you really want to quit now?
 
 OK
 
-You scored 27 out of a possible 430, using 123 turns.
+You scored 27 out of a possible 430, using 125 turns.
 
 You are obviously a rank amateur.  Better luck next time.
 

diff --git a/tests/illformed.log b/tests/illformed.log
index 1ee23a59c0e86ec32c1561f54f62e974f37a0869..f3b781fc418604af08a9fe95cb82a2c26e1046a8 100644 (file)
--- a/tests/illformed.log
+++ b/tests/illformed.log
@@ -13,6 +13,8 @@ say rub
 say grate
 _
 back
+seed
+waste
 eat grate
 eat building
 in

diff --git a/tests/lampdim.chk b/tests/lampdim.chk
index 0589e26e539734e9dbef5dea5759b826f70e8536..41faeb4c658b20a29365de10cccb48496f7a9f10 100644 (file)
--- a/tests/lampdim.chk
+++ b/tests/lampdim.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/lampdim2.chk b/tests/lampdim2.chk
index 9f4f455b5669773e98359948ce3fc5fdef08063c..eff215702e729c9193c5f4417bc6a0c5bdf1a9e9 100644 (file)
--- a/tests/lampdim2.chk
+++ b/tests/lampdim2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/lampdim3.chk b/tests/lampdim3.chk
index 17f721fdc9068f421cf95af69ccd0e52d26d3f38..56ad30f9fe09beffa16f00fb808a3177d1b08415 100644 (file)
--- a/tests/lampdim3.chk
+++ b/tests/lampdim3.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/listenloud.chk b/tests/listenloud.chk
index 60ef13b469100554ab619353ffe36586541e2df7..2843ed23f43fcc913ed2e0780cc933d754dd3f21 100644 (file)
--- a/tests/listenloud.chk
+++ b/tests/listenloud.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/lockchain.chk b/tests/lockchain.chk
index 2b71194e87b9affbbf72c92dfa9001de9e6a8f1f..6af55cbb7ee6bb74643470cfc52df9f7e0b33d8b 100644 (file)
--- a/tests/lockchain.chk
+++ b/tests/lockchain.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/mazealldiff.chk b/tests/mazealldiff.chk
index 7baf1a90bc382933c4ad073bf66aa2ffb10a39f9..10d289fdd1c32345c363f5e0d9128ac3a5d1cb78 100644 (file)
--- a/tests/mazealldiff.chk
+++ b/tests/mazealldiff.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/mazehint.chk b/tests/mazehint.chk
index f762ebbbe92a78080468d63b451861248e5ea9ad..0d001196401df930f3ab529520727fc9007f614d 100644 (file)
--- a/tests/mazehint.chk
+++ b/tests/mazehint.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1071883378
+
 Seed set to 1071883378
 
 You're in front of building.

diff --git a/tests/notrident.chk b/tests/notrident.chk
index fa1b1f96577186d9acf4ab3834bb6b7d5eda0a99..b9ccccf30e1c64fe8ad49575ab08a8f7c73a5762 100644 (file)
--- a/tests/notrident.chk
+++ b/tests/notrident.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/ogre_no_dwarves.chk b/tests/ogre_no_dwarves.chk
index 087c7657b29ff4a959630bc44a12c57415f81519..dff2bc5c71792af72751def6355aaab320b255e8 100644 (file)
--- a/tests/ogre_no_dwarves.chk
+++ b/tests/ogre_no_dwarves.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 25508795
+
 Seed set to 25508795
 
 You're in front of building.

diff --git a/tests/ogrehint.chk b/tests/ogrehint.chk
index 1cd0ca23cd1db3b3b45993c537aee927606c6a79..bff9632cb0f86f6873e33668600340152c79da7d 100644 (file)
--- a/tests/ogrehint.chk
+++ b/tests/ogrehint.chk
@@ -8,11 +8,13 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 437547289
+
 Seed set to 437547289
 
 You're in front of building.
 
 > seed 1071883378
+
 Seed set to 1071883378
 
 You're in front of building.

diff --git a/tests/oilplant.chk b/tests/oilplant.chk
index 3d76b660c8c48d5845d6c8175b84ad4b93415908..bb1c0c367ea5dc51308f1d228937a6df470d9121 100644 (file)
--- a/tests/oilplant.chk
+++ b/tests/oilplant.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/panic.chk b/tests/panic.chk
index 493337148afcd102a253ef154d4ac17dfdf08c80..3af6d4fd48bdbbebb003a6772abe66cbd5846919 100644 (file)
--- a/tests/panic.chk
+++ b/tests/panic.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/panic2.chk b/tests/panic2.chk
index 180e63387fd7933f10e8152765935c0412a9ef2e..98be4c841dc61dc8896e3b75621d4843d4afb873 100644 (file)
--- a/tests/panic2.chk
+++ b/tests/panic2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/pirate_carry.chk b/tests/pirate_carry.chk
index f19a29037570c739aa1ca10a4049f94542e97958..1f7498c0cd02a4543bd054c0b81dd1f4df0e5738 100644 (file)
--- a/tests/pirate_carry.chk
+++ b/tests/pirate_carry.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1837473132
+
 Seed set to 1837473132
 
 You're in front of building.

diff --git a/tests/pirate_pyramid.chk b/tests/pirate_pyramid.chk
index e1837c90e86f885eeb2d4bc0c8996f7361f76b19..00fbc28bd409a02d8cd52487b47f06355c7ff86e 100644 (file)
--- a/tests/pirate_pyramid.chk
+++ b/tests/pirate_pyramid.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1830473132
+
 Seed set to 1830473132
 
 You're in front of building.

diff --git a/tests/pirate_spotted.chk b/tests/pirate_spotted.chk
index 857913931d100151771959540441ad52131025b1..c3ec8975afb9f0cec67beab8d20afc969b60e6ae 100644 (file)
--- a/tests/pirate_spotted.chk
+++ b/tests/pirate_spotted.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/pitfall.chk b/tests/pitfall.chk
index 12860584e44136c60d92eae54148c09695048d8c..f812b6c1eb422c812f08b62dea4c60664b7d2b05 100644 (file)
--- a/tests/pitfall.chk
+++ b/tests/pitfall.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 780351908
+
 Seed set to 780351908
 
 You're in front of building.

diff --git a/tests/plover.chk b/tests/plover.chk
index c1c628e23bf4d51ec1355ef96047796b83527c63..ebe1ba7966ba61d1d6fa5ca591c955b1bc3e23f0 100644 (file)
--- a/tests/plover.chk
+++ b/tests/plover.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/reach_ledge_short.chk b/tests/reach_ledge_short.chk
index cdb18dce81e74981f876682564e3b93deca9733e..1e7dd6208cc30e25df4a2db552a5a1912fb25339 100644 (file)
--- a/tests/reach_ledge_short.chk
+++ b/tests/reach_ledge_short.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/reach_noclimb.chk b/tests/reach_noclimb.chk
index be868ceca3daa08d941b058fb63fec14ed8c58fc..31606468f629e73447f546b654c575533dc6b995 100644 (file)
--- a/tests/reach_noclimb.chk
+++ b/tests/reach_noclimb.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/reach_planttop.chk b/tests/reach_planttop.chk
index 85019c8db3fe77e6b7a3d3e74e8c1fa7f4dc802b..8009e1fa8d2e60d38b244bebe02f44c0740d3c24 100644 (file)
--- a/tests/reach_planttop.chk
+++ b/tests/reach_planttop.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/reincarnate.chk b/tests/reincarnate.chk
index 4f5cc601b1338597c9f6df55b8302889d9e694dc..c8a884260d569b0149593fe9728fc1929cfa320c 100644 (file)
--- a/tests/reincarnate.chk
+++ b/tests/reincarnate.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1495774850
+
 Seed set to 1495774850
 
 You're in front of building.

diff --git a/tests/resumefail.chk b/tests/resumefail.chk
index 27f8271a073e45a425a391880d806e70379af1d1..7be9b12bc2b5e5d5f9c0b6ba1d813232ee4a21be 100644 (file)
--- a/tests/resumefail.chk
+++ b/tests/resumefail.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1240742801
+
 Seed set to 1240742801
 
 You're in front of building.

diff --git a/tests/savefail.chk b/tests/savefail.chk
index 7bce9d09db79f7483bb725b52a8e4d4fa382d92f..de89a538adabf32a835fa140f1ee9767dc6eccd7 100644 (file)
--- a/tests/savefail.chk
+++ b/tests/savefail.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1240742801
+
 Seed set to 1240742801
 
 You're in front of building.

diff --git a/tests/saveresume.1.chk b/tests/saveresume.1.chk
index 0ee7b5d1ef4c6856ef981fffdc78b9b2a1dcad7e..711d158256f8daaee04695822bcc31e78f1041f8 100644 (file)
--- a/tests/saveresume.1.chk
+++ b/tests/saveresume.1.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1240742801
+
 Seed set to 1240742801
 
 You're in front of building.

diff --git a/tests/saveresume.3.chk b/tests/saveresume.3.chk
index 9ebe8ccdda6b785bd77c42787137e7897fd8255c..df532efda6b660c70a6489baf47531f633991c5e 100644 (file)
--- a/tests/saveresume.3.chk
+++ b/tests/saveresume.3.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/seedcrash.chk b/tests/seedcrash.chk
index 88dc02b0fc274992993bab60bfd65f01e08f942d..7590280e91142c7ce8b367516d692d97c64670c5 100644 (file)
--- a/tests/seedcrash.chk
+++ b/tests/seedcrash.chk
@@ -8,6 +8,7 @@ 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.
@@ -1274,6 +1275,7 @@ You're in Shell Room.
 There is an enormous clam here with its shell tightly closed.
 
 > seed 1635997320
+
 Seed set to 1635997320
 
 You're in Shell Room.

diff --git a/tests/snake_food.chk b/tests/snake_food.chk
index 06349869eeea63c6171e8999303cfa3e0189172e..96f690003b16aa1181916eb6198010d66b96d4fa 100644 (file)
--- a/tests/snake_food.chk
+++ b/tests/snake_food.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1951269982
+
 Seed set to 1951269982
 
 You're in front of building.

diff --git a/tests/splatter.chk b/tests/splatter.chk
index a1f8e60215b07fe2818c7a3e97fb11c8352ec220..67b43682f2d1a481db56f9f379cc2a0a56c0a63c 100644 (file)
--- a/tests/splatter.chk
+++ b/tests/splatter.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/tall.chk b/tests/tall.chk
index 8beaa77bc0cb6b369f0548440bc07761d5ecd484..7a30299f0806cf1c48f0bbbbea261d70f88534ef 100644 (file)
--- a/tests/tall.chk
+++ b/tests/tall.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/trident.chk b/tests/trident.chk
index 55593c002cc5be01355e4f52d6d618d8fcb0fb32..5d9f213b12328948f73df94f1e779ba489fe8d40 100644 (file)
--- a/tests/trident.chk
+++ b/tests/trident.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1071883378
+
 Seed set to 1071883378
 
 You're in front of building.

diff --git a/tests/troll_returns.chk b/tests/troll_returns.chk
index 00dc700ff4584d030f70a1c6324d00a9018af46f..911861886b83f93516279fdf8de70f3263e876e1 100644 (file)
--- a/tests/troll_returns.chk
+++ b/tests/troll_returns.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/turnpenalties.chk b/tests/turnpenalties.chk
index fa9bf4678b39785c01298ff657a588556966db17..88315a34a119d7ec3ed181d7d99ae479e1044090 100644 (file)
--- a/tests/turnpenalties.chk
+++ b/tests/turnpenalties.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1951269982
+
 Seed set to 1951269982
 
 You're in front of building.

diff --git a/tests/urntest.chk b/tests/urntest.chk
index a3a4503f8309114b16c660027e3961a0fca67b9c..dcfde2c2bae4062eb4e469bee37514f0b772c8c9 100644 (file)
--- a/tests/urntest.chk
+++ b/tests/urntest.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/urntest2.chk b/tests/urntest2.chk
index 35a18acffa790ac401e98c2b8eb42dfa13711a85..56c6a0c235113545ec94ba05ac6e78ccb9206801 100644 (file)
--- a/tests/urntest2.chk
+++ b/tests/urntest2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/urntest3.chk b/tests/urntest3.chk
index ec16bbd302f75979c16ef58f8b28a06d25624a0d..18829cf210ee02ea4d40b4f09438e8a45e155305 100644 (file)
--- a/tests/urntest3.chk
+++ b/tests/urntest3.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/vending.chk b/tests/vending.chk
index 229dd89412253831e25b207d7e2da8dfa5df7a43..6e67b28f73d3a0b9d046be0dbb043b32e65aee26 100644 (file)
--- a/tests/vending.chk
+++ b/tests/vending.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/wakedwarves.chk b/tests/wakedwarves.chk
index c8dfd32012af9e5976e125dcfbd9484b453bf829..4f79d76d3d10524a60b34224c298d68c5f8edf66 100644 (file)
--- a/tests/wakedwarves.chk
+++ b/tests/wakedwarves.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/wakedwarves2.chk b/tests/wakedwarves2.chk
index f899bd0711d6fd735489e8a48eb5b3ed2d8a94c3..f33992482faac7c4081ac4684fd4a2f5d41b0f3b 100644 (file)
--- a/tests/wakedwarves2.chk
+++ b/tests/wakedwarves2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/wakedwarves3.chk b/tests/wakedwarves3.chk
index 48a72ca013d80fdd66f9379782e773211b0d2945..5ae3b7454c5e9d0e357981232abc168094227c07 100644 (file)
--- a/tests/wakedwarves3.chk
+++ b/tests/wakedwarves3.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1838473132
+
 Seed set to 1838473132
 
 You're in front of building.

diff --git a/tests/water_plant2.chk b/tests/water_plant2.chk
index 20f97d20ca4c04ce56afc37b702331cd9690679a..4ccbe2b3493202d4981eed9fb917f8b45601fd97 100644 (file)
--- a/tests/water_plant2.chk
+++ b/tests/water_plant2.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 183847312
+
 Seed set to 183847312
 
 You're in front of building.

diff --git a/tests/weirdbird.chk b/tests/weirdbird.chk
index 5e298b2f7d1915911ffe5ce1d3a44efdefbf5163..52f5eb7217f39e5d7a9468b78725336233da42bc 100644 (file)
--- a/tests/weirdbird.chk
+++ b/tests/weirdbird.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 694608006
+
 Seed set to 694608006
 
 You're in front of building.

diff --git a/tests/weirddwarf.chk b/tests/weirddwarf.chk
index 90104c8ee20ab9935ddc8f535e8c89a84a758779..24fb92eb0989d2b067d25be9bfd1264d1b292951 100644 (file)
--- a/tests/weirddwarf.chk
+++ b/tests/weirddwarf.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 1071883378
+
 Seed set to 1071883378
 
 You're in front of building.

diff --git a/tests/wittsend.chk b/tests/wittsend.chk
index a4bb9b7a67e014149d25f658b053c7ec0b04a28d..ac54c717f0e76e66aa17572b1a3a0a480cc3ddee 100644 (file)
--- a/tests/wittsend.chk
+++ b/tests/wittsend.chk
@@ -8,6 +8,7 @@ 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.

diff --git a/tests/woodshint.chk b/tests/woodshint.chk
index c8cdc08ffd19c67225bbb00650acc81c587d44d6..c26d4710aba38b980b02cd9495bda74b8781eada 100644 (file)
--- a/tests/woodshint.chk
+++ b/tests/woodshint.chk
@@ -8,6 +8,7 @@ Around you is a forest.  A small stream flows out of the building and
 down a gully.
 
 > seed 2099333241
+
 Seed set to 2099333241
 
 You're in front of building.