X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=adventure.yaml;h=29516625008065157a4c0e349f4d1f43e67465d7;hp=64749a95669ee6f9ec2a6274067936622309518c;hb=1e643da216737e148839f463c10594bbb8ac246b;hpb=302538893264ee65bb9c50bf9bf988f53c0422db

diff --git a/adventure.yaml b/adventure.yaml
index 64749a9..2951662 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -6,14 +6,17 @@
 #
 # We define a bunch of YAML structures:
 #
-# vocabulary: Almost all the words the game knows - one of them (the
+# vocabulary: - This structure is unused, and will eventually be removed. -
+#    Almost all the words the game knows - one of them (the
 #    reservoir magic word) gets replaced with a randomly-generated
 #    cookie.  For each word there is a type (motion, action, object,
 #    or special) and a numeric value.  Multiple synonyms may have the
 #    same value.
 #
-# actspk: Default message for action verbs.  The numbers correspond to
-#    values in the vocabulary list.
+# motions: Motion words, grouped into synonyms.
+#
+# actions: Action words, grouped into synonyms, and their corresponding
+#    default messages.
 #
 # hints: Each item contains a hint number, a hint label (used to
 #    generate the value macro for the hint) the number of turns he
@@ -53,10 +56,10 @@
 #                    a named location) a speak (utter a named message), or
 #                    a special (branch to special case in movement code).
 #                    The conditional may be one of the following:
-#                      [pct N]       Roll a die, n% chance of success
-#                      [carry OBJ]   Must be carrying named object
-#                      [with OBJ]    Must be carrying or in room with
-#                      [not OBJ N]   Property of named OBJ must not be N
+#                      [pct, N]       Roll a die, n% chance of success
+#                      [carry, OBJ]   Must be carrying named object
+#                      [with, OBJ]    Must be carrying or in room with
+#                      [not, OBJ N]   Property of named OBJ must not be N
 #    All attributes are optional except the long description and
 #    travel. Order of locations is not significant.
 #
@@ -80,16 +83,17 @@
 #    Order doesn't matter; the logic simply tests every threshold on
 #    the assumption that turn counts never decrease nor skip values.
 #
-# object_descriptions: Each item contains a description for use in the
+# objects: Each item contains a description for use in the
 #    inventory command and one or more messages describing the object
-#    in different states.  There is also a boolean "treasure"
-#    attribute, defaulting to false.  An pbject may have one or two
+#    in different states.  The vocabulary word(s) referring to this
+#    object are listed (words).  There is also a boolean "treasure"
+#    attribute, defaulting to false.  An object may have one or two
 #    start locations (the gate is an example of a two-location object;
 #    it can be accessed from above or below).  An object may also be
 #    flagged immovable, meaning it cannot be carried.  If a state
 #    message is a tuple then the first element is made the name of a
-#    #define viible to the code for the associayed state, numbered
-#    from zero upwards. If the inventory desription begins with "*"
+#    #define visble to the code for the associated state, numbered
+#    from zero upwards. If the inventory description begins with "*"
 #    the object is dungeon furniture that cannot be taken or carried.
 #
 # obituaries: Death messages and reincarnation queries.  Order is
@@ -220,110 +224,6 @@ vocabulary: [
     {word: "RESER", type: motion, value: 75},
     {word: "MAIN",  type: motion, value: 76},
     {word: "OFFIC", type: motion, value: 76},
-    {word: "KEYS",  type: object, value: 1},
-    {word: "KEY",   type: object, value: 1},
-    {word: "LAMP",  type: object, value: 2},
-    {word: "LANTE", type: object, value: 2},
-    {word: "GRATE", type: object, value: 3},
-    {word: "CAGE",  type: object, value: 4},
-    {word: "ROD",   type: object, value: 5},
-    {word: "ROD",   type: object, value: 6}, # Must be next object after "real" rod
-    {word: "STEPS", type: object, value: 7},
-    {word: "BIRD",  type: object, value: 8},
-    {word: "DOOR",  type: object, value: 9},
-    {word: "PILLO", type: object, value: 10},
-    {word: "VELVE", type: object, value: 10},
-    {word: "SNAKE", type: object, value: 11},
-    {word: "FISSU", type: object, value: 12},
-    {word: "TABLE", type: object, value: 13},
-    {word: "CLAM",  type: object, value: 14},
-    {word: "OYSTE", type: object, value: 15},
-    {word: "MAGAZ", type: object, value: 16},
-    {word: "ISSUE", type: object, value: 16},
-    {word: "SPELU", type: object, value: 16},
-    {word: '"SPEL', type: object, value: 16},
-    {word: "DWARF", type: object, value: 17},
-    {word: "DWARV", type: object, value: 17},
-    {word: "KNIFE", type: object, value: 18},
-    {word: "KNIVE", type: object, value: 18},
-    {word: "FOOD",  type: object, value: 19},
-    {word: "RATIO", type: object, value: 19},
-    {word: "BOTTL", type: object, value: 20},
-    {word: "JAR",   type: object, value: 20},
-    {word: "WATER", type: object, value: 21},
-    {word: "H2O",   type: object, value: 21},
-    {word: "OIL",   type: object, value: 22},
-    {word: "MIRRO", type: object, value: 23},
-    {word: "PLANT", type: object, value: 24},
-    {word: "BEANS", type: object, value: 24},
-    {word: "PLANT", type: object, value: 25}, # Must be next object after "real" plant
-    {word: "STALA", type: object, value: 26},
-    {word: "SHADO", type: object, value: 27},
-    {word: "FIGUR", type: object, value: 27},
-    {word: "WINDO", type: object, value: 27}, # Same as figure
-    {word: "AXE",   type: object, value: 28},
-    {word: "DRAWI", type: object, value: 29},
-    {word: "PIRAT", type: object, value: 30},
-    {word: "GENIE", type: object, value: 30},
-    {word: "DJINN", type: object, value: 30},
-    {word: "DRAGO", type: object, value: 31},
-    {word: "CHASM", type: object, value: 32},
-    {word: "TROLL", type: object, value: 33},
-    {word: "TROLL", type: object, value: 34}, # Must be next object after "real" troll
-    {word: "BEAR",  type: object, value: 35},
-    {word: "MESSA", type: object, value: 36},
-    {word: "VOLCA", type: object, value: 37},
-    {word: "GEYSE", type: object, value: 37}, # Same as volcano
-    {word: "MACHI", type: object, value: 38},
-    {word: "VENDI", type: object, value: 38},
-    {word: "BATTE", type: object, value: 39},
-    {word: "CARPE", type: object, value: 40},
-    {word: "MOSS",  type: object, value: 40},
-    {word: "CURTA", type: object, value: 40}, # Same as carpet
-    {word: "OGRE",  type: object, value: 41},
-    {word: "URN",   type: object, value: 42},
-    {word: "CAVIT", type: object, value: 43},
-    {word: "BLOOD", type: object, value: 44},
-    {word: "RESER", type: object, value: 45}, # Verb overrides
-    {word: "APPEN", type: object, value: 46},
-    {word: "LEPOR", type: object, value: 46},
-    {word: "MUD",   type: object, value: 47},
-    {word: "NOTE",  type: object, value: 48},
-    {word: "SIGN",  type: object, value: 49},
-    {word: "GOLD",  type: object, value: 50},
-    {word: "NUGGE", type: object, value: 50},
-    {word: "DIAMO", type: object, value: 51},
-    {word: "SILVE", type: object, value: 52},
-    {word: "BARS",  type: object, value: 52},
-    {word: "JEWEL", type: object, value: 53},
-    {word: "COINS", type: object, value: 54},
-    {word: "CHEST", type: object, value: 55},
-    {word: "BOX",   type: object, value: 55},
-    {word: "TREAS", type: object, value: 55},
-    {word: "EGGS",  type: object, value: 56},
-    {word: "EGG",   type: object, value: 56},
-    {word: "NEST",  type: object, value: 56},
-    {word: "TRIDE", type: object, value: 57},
-    {word: "VASE",  type: object, value: 58},
-    {word: "MING",  type: object, value: 58},
-    {word: "SHARD", type: object, value: 58},
-    {word: "POTTE", type: object, value: 58},
-    {word: "EMERA", type: object, value: 59},
-    {word: "PLATI", type: object, value: 60},
-    {word: "PYRAM", type: object, value: 60},
-    {word: "PEARL", type: object, value: 61},
-    {word: "RUG",   type: object, value: 62},
-    {word: "PERSI", type: object, value: 62},
-    {word: "SPICE", type: object, value: 63},
-    {word: "CHAIN", type: object, value: 64},
-    {word: "RUBY",  type: object, value: 65},
-    {word: "JADE",  type: object, value: 66},
-    {word: "NECKL", type: object, value: 66},
-    {word: "AMBER", type: object, value: 67},
-    {word: "GEMST", type: object, value: 67},
-    {word: "SAPPH", type: object, value: 68},
-    {word: "EBONY", type: object, value: 69},
-    {word: "STATU", type: object, value: 69},
     {word: "CARRY", type: action, value: 1},
     {word: "TAKE",  type: action, value: 1},
     {word: "KEEP",  type: action, value: 1},
@@ -444,43 +344,271 @@ vocabulary: [
     {word: "NEWS",  type: special, value: 275},
 ]
 
-actspk: {
-    1: ALREADY_CARRYING,
-    2: ARENT_CARRYING,
-    3: NO_MESSAGE,
-    4: NOT_LOCKABLE,
-    5: NO_MESSAGE,
-    6: NOT_LOCKABLE,
-    7: DONT_UNDERSTAND,
-    8: DONT_UNDERSTAND,
-    9: NOTHING_HAPPENS,
-    10: AM_GAME,
-    11: WHERE_QUERY,
-    12: RIDICULOUS_ATTEMPT,
-    13: ARENT_CARRYING,
-    14: RIDICULOUS_ATTEMPT,
-    15: STREAM_WATER,
-    16: RUB_NOGO,
-    17: ARENT_CARRYING,
-    18: HUH_MAN,
-    19: NEARBY,
-    20: NEARBY,
-    21: NO_EDIBLES,
-    22: CANT_FILL,
-    23: REQUIRES_DYNAMITE,
-    24: HUH_MAN,
-    25: NOT_KNOWHOW,
-    26: ON_WHAT,
-    27: DONT_UNDERSTAND,
-    28: BEYOND_POWER,
-    29: RIDICULOUS_ATTEMPT,
-    30: HUH_MAN,
-    31: HUH_MAN,
-    32: AM_GAME,
-    33: DONT_UNDERSTAND,
-    34: NOTHING_HAPPENS,
-    35: HUH_MAN,
-}
+motions: !!omap
+- MOT_0:
+    words: !!null
+- MOT_1:
+    words: !!null
+- MOT_2:
+    words: ['road', 'hill']
+- ENTER:
+    words: ['enter']
+- MOT_4:
+    words: ['upstr']
+- MOT_5:
+    words: ['downs']
+- MOT_6:
+    words: ['fores']
+- MOT_7:
+    words: ['forwa', 'conti', 'onwar']
+- BACK:
+    words: ['back', 'retur', 'retre']
+- MOT_9:
+    words: ['valle']
+- MOT_10:
+    words: ['stair']
+- MOT_11:
+    words: ['out', 'outsi', 'exit', 'leave']
+- MOT_12:
+    words: ['build', 'house']
+- MOT_13:
+    words: ['gully']
+- STREAM:
+    words: ['strea']
+- MOT_15:
+    words: ['fork']
+- MOT_16:
+    words: ['bed']
+- MOT_17:
+    words: ['crawl']
+- MOT_18:
+    words: ['cobbl']
+- MOT_19:
+    words: ['inwar', 'insid', 'in']
+- MOT_20:
+    words: ['surfa']
+- NUL:
+    words: ['null', 'nowhe']
+- MOT_22:
+    words: ['dark']
+- MOT_23:
+    words: ['passa', 'tunne']
+- MOT_24:
+    words: ['low']
+- MOT_25:
+    words: ['canyo']
+- MOT_26:
+    words: ['awkwa']
+- MOT_27:
+    words: ['giant']
+- MOT_28:
+    words: ['view']
+- MOT_29:
+    words: ['upwar', 'up', 'u', 'above', 'ascen']
+- MOT_30:
+    words: ['d', 'downw', 'down', 'desce']
+- MOT_31:
+    words: ['pit']
+- MOT_32:
+    words: ['outdo']
+- MOT_33:
+    words: ['crack']
+- MOT_34:
+    words: ['steps']
+- MOT_35:
+    words: ['dome']
+- MOT_36:
+    words: ['left']
+- MOT_37:
+    words: ['right']
+- MOT_38:
+    words: ['hall']
+- MOT_39:
+    words: ['jump']
+- MOT_40:
+    words: ['barre']
+- MOT_41:
+    words: ['over']
+- MOT_42:
+    words: ['acros']
+- MOT_43:
+    words: ['east', 'e']
+- MOT_44:
+    words: ['west', 'w']
+- MOT_45:
+    words: ['north', 'n']
+- MOT_46:
+    words: ['south', 's']
+- MOT_47:
+    words: ['ne']
+- MOT_48:
+    words: ['se']
+- MOT_49:
+    words: ['sw']
+- MOT_50:
+    words: ['nw']
+- MOT_51:
+    words: ['debri']
+- MOT_52:
+    words: ['hole']
+- MOT_53:
+    words: ['wall']
+- MOT_54:
+    words: ['broke']
+- MOT_55:
+    words: ['y2']
+- MOT_56:
+    words: ['climb']
+- LOOK:
+    words: ['look', 'exami', 'touch', 'descr']
+- MOT_58:
+    words: ['floor']
+- MOT_59:
+    words: ['room']
+- MOT_60:
+    words: ['slit']
+- MOT_61:
+    words: ['slab', 'slabr']
+- MOT_62:
+    words: ['xyzzy']
+- DPRSSN:
+    words: ['depre']
+- ENTRNC:
+    words: ['entra']
+- MOT_65:
+    words: ['plugh']
+- MOT_66:
+    words: ['secre']
+- CAVE:
+    words: ['cave']
+- MOT_68:
+    words: !!null
+- MOT_69:
+    words: ['cross']
+- MOT_70:
+    words: ['bedqu']
+- MOT_71:
+    words: ['plove']
+- MOT_72:
+    words: ['orien']
+- MOT_73:
+    words: ['caver']
+- MOT_74:
+    words: ['shell']
+- MOT_75:
+    words: ['reser']
+- MOT_76:
+    words: ['main', 'offic']
+
+actions: !!omap
+- ACT_0:
+    message: !!null
+    words: !!null
+- ACT_1:
+    message: ALREADY_CARRYING
+    words: ['carry', 'take', 'keep', 'catch', 'steal', 'captu', 'get', 'tote', 'snarf']
+- ACT_2:
+    message: ARENT_CARRYING
+    words: ['drop', 'relea', 'free', 'disca', 'dump']
+- SAY:
+    message: NO_MESSAGE
+    words: ['say', 'chant', 'sing', 'utter', 'mumbl']
+- ACT_4:
+    message: NOT_LOCKABLE
+    words: ['unloc', 'open']
+- ACT_5:
+    message: NO_MESSAGE
+    words: ['nothi']
+- LOCK:
+    message: NOT_LOCKABLE
+    words: ['lock', 'close']
+- ACT_7:
+    message: DONT_UNDERSTAND
+    words: ['light', 'on']
+- ACT_8:
+    message: DONT_UNDERSTAND
+    words: ['extin', 'off']
+- ACT_9:
+    message: NOTHING_HAPPENS
+    words: ['wave', 'shake', 'swing']
+- ACT_10:
+    message: AM_GAME
+    words: ['calm', 'placa', 'tame']
+- ACT_11:
+    message: WHERE_QUERY
+    words: ['walk', 'run', 'trave', 'go', 'proce', 'conti', 'explo', 'follo', 'turn']
+- ACT_12:
+    message: RIDICULOUS_ATTEMPT
+    words: ['attac', 'kill', 'fight', 'hit', 'strik', 'slay']
+- ACT_13:
+    message: ARENT_CARRYING
+    words: ['pour']
+- ACT_14:
+    message: RIDICULOUS_ATTEMPT
+    words: ['eat', 'devou']
+- ACT_15:
+    message: STREAM_WATER
+    words: ['drink']
+- ACT_16:
+    message: RUB_NOGO
+    words: ['rub']
+- THROW:
+    message: ARENT_CARRYING
+    words: ['throw', 'toss']
+- ACT_18:
+    message: HUH_MAN
+    words: ['quit']
+- FIND:
+    message: NEARBY
+    words: ['find', 'where']
+- INVENT:
+    message: NEARBY
+    words: ['inven']
+- ACT_21:
+    message: NO_EDIBLES
+    words: ['feed']
+- ACT_22:
+    message: CANT_FILL
+    words: ['fill']
+- ACT_23:
+    message: REQUIRES_DYNAMITE
+    words: ['blast', 'deton', 'ignit', 'blowu']
+- ACT_24:
+    message: HUH_MAN
+    words: ['score']
+- ACT_25:
+    message: NOT_KNOWHOW
+    words: ['fee', 'fie', 'foe', 'foo', 'fum']
+- ACT_26:
+    message: ON_WHAT
+    words: ['brief']
+- ACT_27:
+    message: DONT_UNDERSTAND
+    words: ['read', 'perus']
+- ACT_28:
+    message: BEYOND_POWER
+    words: ['break', 'shatt', 'smash']
+- ACT_29:
+    message: RIDICULOUS_ATTEMPT
+    words: ['wake', 'distu']
+- ACT_30:
+    message: HUH_MAN
+    words: ['suspe', 'pause', 'save']
+- ACT_31:
+    message: HUH_MAN
+    words: ['resum', 'resta']
+- ACT_32:
+    message: AM_GAME
+    words: ['fly']
+- ACT_33:
+    message: DONT_UNDERSTAND
+    words: ['liste']
+- ACT_34:
+    message: NOTHING_HAPPENS
+    words: ['z''zzz']
+- ACT_35:
+    message: HUH_MAN
+    words: !!null
 
 hints:
   - hint: &grate
@@ -569,11 +697,11 @@ locations: !!omap
     conditions: {FLUID: true, ABOVE: true, LIT: true}
     sound: STREAM_GURGLES
     travel: [
-      {verbs: ['ROAD', 'WEST', 'UPWAR'], action: ["goto", LOC_HILL]},
-      {verbs: ['ENTER', 'BUILD', 'INWAR', 'EAST'], action: ["goto", LOC_BUILDING]},
-      {verbs: ['DOWNS', 'GULLY', 'STREA', 'SOUTH', 'D'], action: ["goto", LOC_VALLEY]},
-      {verbs: ['FORES', 'NORTH'], action: ["goto", LOC_FOREST1]},
-      {verbs: ['DEPRE'], action: ["goto", LOC_GRATE]},
+      {verbs: ['ROAD', 'WEST', 'UPWAR'], action: [goto, LOC_HILL]},
+      {verbs: ['ENTER', 'BUILD', 'INWAR', 'EAST'], action: [goto, LOC_BUILDING]},
+      {verbs: ['DOWNS', 'GULLY', 'STREA', 'SOUTH', 'D'], action: [goto, LOC_VALLEY]},
+      {verbs: ['FORES', 'NORTH'], action: [goto, LOC_FOREST1]},
+      {verbs: ['DEPRE'], action: [goto, LOC_GRATE]},
     ]
 - LOC_HILL:
     description:
@@ -581,10 +709,10 @@ locations: !!omap
       short: 'You''re at hill in road.'
     conditions: {ABOVE: true, LIT: true}
     travel: [
-      {verbs: ['BUILD', 'EAST'], action: ["goto", LOC_START]},
-      {verbs: ['WEST'], action: ["goto", LOC_ROADEND]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST20]},
-      {verbs: ['SOUTH', 'FORES'], action: ["goto", LOC_FOREST13]},
+      {verbs: ['BUILD', 'EAST'], action: [goto, LOC_START]},
+      {verbs: ['WEST'], action: [goto, LOC_ROADEND]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST20]},
+      {verbs: ['SOUTH', 'FORES'], action: [goto, LOC_FOREST13]},
       {verbs: ['D'], action: ["speak", WHICH_WAY]},
     ]
 - LOC_BUILDING:
@@ -594,10 +722,10 @@ locations: !!omap
     conditions: {FLUID: true, ABOVE: true, LIT: true}
     sound: STREAM_GURGLES
     travel: [
-      {verbs: ['OUT', 'OUTDO', 'WEST'], action: ["goto", LOC_START]},
-      {verbs: ['XYZZY'], action: ["goto", LOC_FOOF1]},
-      {verbs: ['PLUGH'], action: ["goto", LOC_FOOF3]},
-      {verbs: ['DOWNS', 'STREA'], action: ["goto", LOC_SEWER]},
+      {verbs: ['OUT', 'OUTDO', 'WEST'], action: [goto, LOC_START]},
+      {verbs: ['XYZZY'], action: [goto, LOC_FOOF1]},
+      {verbs: ['PLUGH'], action: [goto, LOC_FOOF3]},
+      {verbs: ['DOWNS', 'STREA'], action: [goto, LOC_SEWER]},
     ]
 - LOC_VALLEY:
     description:
@@ -606,11 +734,11 @@ locations: !!omap
     conditions: {FLUID: true, ABOVE: true, LIT: true}
     sound: STREAM_GURGLES
     travel: [
-      {verbs: ['UPSTR', 'BUILD', 'NORTH'], action: ["goto", LOC_START]},
-      {verbs: ['EAST', 'FORES'], action: ["goto", LOC_FOREST6]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST12]},
-      {verbs: ['DOWNS', 'SOUTH', 'D'], action: ["goto", LOC_SLIT]},
-      {verbs: ['DEPRE'], action: ["goto", LOC_GRATE]},
+      {verbs: ['UPSTR', 'BUILD', 'NORTH'], action: [goto, LOC_START]},
+      {verbs: ['EAST', 'FORES'], action: [goto, LOC_FOREST6]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST12]},
+      {verbs: ['DOWNS', 'SOUTH', 'D'], action: [goto, LOC_SLIT]},
+      {verbs: ['DEPRE'], action: [goto, LOC_GRATE]},
       {verbs: ['STREA'], action: ["speak", UPSTREAM_DOWNSTREAM]},
     ]
 - LOC_ROADEND:
@@ -619,11 +747,11 @@ locations: !!omap
       short: 'You''re at end of road.'
     conditions: {ABOVE: true, LIT: true}
     travel: [
-      {verbs: ['ROAD', 'EAST', 'UPWAR'], action: ["goto", LOC_HILL]},
-      {verbs: ['BUILD'], action: ["goto", LOC_START]},
-      {verbs: ['SOUTH', 'FORES'], action: ["goto", LOC_FOREST14]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST15]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST21]},
+      {verbs: ['ROAD', 'EAST', 'UPWAR'], action: [goto, LOC_HILL]},
+      {verbs: ['BUILD'], action: [goto, LOC_START]},
+      {verbs: ['SOUTH', 'FORES'], action: [goto, LOC_FOREST14]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST15]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST21]},
     ]
 - LOC_CLIFF:
     description:
@@ -632,9 +760,9 @@ locations: !!omap
     conditions: {ABOVE: true, NOBACK: true, LIT: true}
     hints: [*urn]
     travel: [
-      {verbs: ['SOUTH', 'FORES'], action: ["goto", LOC_FOREST17]},
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST19]},
-      {verbs: ['JUMP'], action: ["goto", LOC_NOMAKE]},
+      {verbs: ['SOUTH', 'FORES'], action: [goto, LOC_FOREST17]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST19]},
+      {verbs: ['JUMP'], action: [goto, LOC_NOMAKE]},
     ]
 - LOC_SLIT:
     description:
@@ -643,11 +771,11 @@ locations: !!omap
     conditions: {FLUID: true, ABOVE: true, LIT: true}
     sound: STREAM_GURGLES
     travel: [
-      {verbs: ['BUILD'], action: ["goto", LOC_START]},
-      {verbs: ['UPSTR', 'NORTH'], action: ["goto", LOC_VALLEY]},
-      {verbs: ['EAST', 'FORES'], action: ["goto", LOC_FOREST6]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST10]},
-      {verbs: ['DOWNS', 'BED', 'SOUTH', 'DEPRE'], action: ["goto", LOC_GRATE]},
+      {verbs: ['BUILD'], action: [goto, LOC_START]},
+      {verbs: ['UPSTR', 'NORTH'], action: [goto, LOC_VALLEY]},
+      {verbs: ['EAST', 'FORES'], action: [goto, LOC_FOREST6]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST10]},
+      {verbs: ['DOWNS', 'BED', 'SOUTH', 'DEPRE'], action: [goto, LOC_GRATE]},
       {verbs: ['SLIT', 'STREA', 'D', 'INWAR', 'ENTER'], action: ["speak", DONT_FIT]},
     ]
 - LOC_GRATE:
@@ -657,12 +785,12 @@ locations: !!omap
     conditions: {ABOVE: true, LIT: true}
     hints: [*grate, *jade]
     travel: [
-      {verbs: ['EAST', 'FORES'], action: ["goto", LOC_FOREST7]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST10]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST9]},
-      {verbs: ['BUILD'], action: ["goto", LOC_START]},
-      {verbs: ['UPSTR', 'GULLY', 'NORTH'], action: ["goto", LOC_SLIT]},
-      {verbs: ['ENTER', 'INWAR', 'D'], cond: [not OBJ_3 0], action: ["goto", LOC_BELOWGRATE]},
+      {verbs: ['EAST', 'FORES'], action: [goto, LOC_FOREST7]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST10]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST9]},
+      {verbs: ['BUILD'], action: [goto, LOC_START]},
+      {verbs: ['UPSTR', 'GULLY', 'NORTH'], action: [goto, LOC_SLIT]},
+      {verbs: ['ENTER', 'INWAR', 'D'], cond: [not, GRATE, 0,], action: [goto, LOC_BELOWGRATE]},
       {verbs: ['ENTER'], action: ["speak", GRATE_NOWAY]},
     ]
 - LOC_BELOWGRATE:
@@ -671,11 +799,11 @@ locations: !!omap
       short: 'You''re below the grate.'
     conditions: {LIT: true}
     travel: [
-      {verbs: ['OUT', 'UPWAR'], cond: [not OBJ_3 0], action: ["goto", LOC_GRATE]},
+      {verbs: ['OUT', 'UPWAR'], cond: [not, GRATE, 0], action: [goto, LOC_GRATE]},
       {verbs: ['OUT'], action: ["speak", GRATE_NOWAY]},
-      {verbs: ['CRAWL', 'COBBL', 'INWAR', 'WEST'], action: ["goto", LOC_COBBLE]},
-      {verbs: ['PIT'], action: ["goto", LOC_PITTOP]},
-      {verbs: ['DEBRI'], action: ["goto", LOC_DEBRIS]},
+      {verbs: ['CRAWL', 'COBBL', 'INWAR', 'WEST'], action: [goto, LOC_COBBLE]},
+      {verbs: ['PIT'], action: [goto, LOC_PITTOP]},
+      {verbs: ['DEBRI'], action: [goto, LOC_DEBRIS]},
     ]
 - LOC_COBBLE:
     description:
@@ -683,9 +811,9 @@ locations: !!omap
       short: 'You''re in cobble crawl.'
     conditions: {LIT: true}
     travel: [
-      {verbs: ['OUT', 'SURFA', 'NULL', 'EAST'], action: ["goto", LOC_BELOWGRATE]},
-      {verbs: ['INWAR', 'DARK', 'WEST', 'DEBRI'], action: ["goto", LOC_DEBRIS]},
-      {verbs: ['PIT'], action: ["goto", LOC_PITTOP]},
+      {verbs: ['OUT', 'SURFA', 'NULL', 'EAST'], action: [goto, LOC_BELOWGRATE]},
+      {verbs: ['INWAR', 'DARK', 'WEST', 'DEBRI'], action: [goto, LOC_DEBRIS]},
+      {verbs: ['PIT'], action: [goto, LOC_PITTOP]},
     ]
 - LOC_DEBRIS:
     description:
@@ -693,12 +821,12 @@ locations: !!omap
       short: 'You''re in debris room.'
     conditions: {}
     travel: [
-      {verbs: ['DEPRE'], cond: [not OBJ_3 0], action: ["goto", LOC_GRATE]},
-      {verbs: ['ENTRA'], action: ["goto", LOC_BELOWGRATE]},
-      {verbs: ['CRAWL', 'COBBL', 'PASSA', 'LOW', 'EAST'], action: ["goto", LOC_COBBLE]},
-      {verbs: ['CANYO', 'INWAR', 'UPWAR', 'WEST'], action: ["goto", LOC_AWKWARD]},
-      {verbs: ['XYZZY'], action: ["goto", LOC_FOOF2]},
-      {verbs: ['PIT'], action: ["goto", LOC_PITTOP]},
+      {verbs: ['DEPRE'], cond: [not, GRATE, 0], action: [goto, LOC_GRATE]},
+      {verbs: ['ENTRA'], action: [goto, LOC_BELOWGRATE]},
+      {verbs: ['CRAWL', 'COBBL', 'PASSA', 'LOW', 'EAST'], action: [goto, LOC_COBBLE]},
+      {verbs: ['CANYO', 'INWAR', 'UPWAR', 'WEST'], action: [goto, LOC_AWKWARD]},
+      {verbs: ['XYZZY'], action: [goto, LOC_FOOF2]},
+      {verbs: ['PIT'], action: [goto, LOC_PITTOP]},
     ]
 - LOC_AWKWARD:
     description:
@@ -706,11 +834,11 @@ locations: !!omap
       short: !!null
     conditions: {}
     travel: [
-      {verbs: ['DEPRE'], cond: [not OBJ_3 0], action: ["goto", LOC_GRATE]},
-      {verbs: ['ENTRA'], action: ["goto", LOC_BELOWGRATE]},
-      {verbs: ['D', 'EAST', 'DEBRI'], action: ["goto", LOC_DEBRIS]},
-      {verbs: ['INWAR', 'UPWAR', 'WEST'], action: ["goto", LOC_BIRD]},
-      {verbs: ['PIT'], action: ["goto", LOC_PITTOP]},
+      {verbs: ['DEPRE'], cond: [not, GRATE, 0], action: [goto, LOC_GRATE]},
+      {verbs: ['ENTRA'], action: [goto, LOC_BELOWGRATE]},
+      {verbs: ['D', 'EAST', 'DEBRI'], action: [goto, LOC_DEBRIS]},
+      {verbs: ['INWAR', 'UPWAR', 'WEST'], action: [goto, LOC_BIRD]},
+      {verbs: ['PIT'], action: [goto, LOC_PITTOP]},
     ]
 - LOC_BIRD:
     description:
@@ -719,11 +847,11 @@ locations: !!omap
     conditions: {}
     hints: [*bird] 
     travel: [
-      {verbs: ['DEPRE'], cond: [not OBJ_3 0], action: ["goto", LOC_GRATE]},
-      {verbs: ['ENTRA'], action: ["goto", LOC_BELOWGRATE]},
-      {verbs: ['DEBRI'], action: ["goto", LOC_DEBRIS]},
-      {verbs: ['CANYO', 'EAST'], action: ["goto", LOC_AWKWARD]},
-      {verbs: ['PASSA', 'PIT', 'WEST'], action: ["goto", LOC_PITTOP]},
+      {verbs: ['DEPRE'], cond: [not, GRATE, 0], action: [goto, LOC_GRATE]},
+      {verbs: ['ENTRA'], action: [goto, LOC_BELOWGRATE]},
+      {verbs: ['DEBRI'], action: [goto, LOC_DEBRIS]},
+      {verbs: ['CANYO', 'EAST'], action: [goto, LOC_AWKWARD]},
+      {verbs: ['PASSA', 'PIT', 'WEST'], action: [goto, LOC_PITTOP]},
     ]
 - LOC_PITTOP:
     description:
@@ -731,13 +859,13 @@ locations: !!omap
       short: 'You''re at top of small pit.'
     conditions: {}
     travel: [
-      {verbs: ['DEPRE'], cond: [not OBJ_3 0], action: ["goto", LOC_GRATE]},
-      {verbs: ['ENTRA'], action: ["goto", LOC_BELOWGRATE]},
-      {verbs: ['DEBRI'], action: ["goto", LOC_DEBRIS]},
-      {verbs: ['PASSA', 'EAST'], action: ["goto", LOC_BIRD]},
-      {verbs: ['D', 'PIT', 'STEPS'], cond: [carry OBJ_50], action: ["goto", LOC_NECKBROKE]},
-      {verbs: ['D'], action: ["goto", LOC_MISTHALL]},
-      {verbs: ['CRACK', 'WEST'], action: ["goto", LOC_CRACK]},
+      {verbs: ['DEPRE'], cond: [not, GRATE, 0], action: [goto, LOC_GRATE]},
+      {verbs: ['ENTRA'], action: [goto, LOC_BELOWGRATE]},
+      {verbs: ['DEBRI'], action: [goto, LOC_DEBRIS]},
+      {verbs: ['PASSA', 'EAST'], action: [goto, LOC_BIRD]},
+      {verbs: ['D', 'PIT', 'STEPS'], cond: [carry, NUGGET], action: [goto, LOC_NECKBROKE]},
+      {verbs: ['D'], action: [goto, LOC_MISTHALL]},
+      {verbs: ['CRACK', 'WEST'], action: [goto, LOC_CRACK]},
     ]
 - LOC_MISTHALL:
     description:
@@ -747,12 +875,12 @@ locations: !!omap
     hints: [*jade]
     sound: WIND_WHISTLES
     travel: [
-      {verbs: ['LEFT', 'SOUTH'], action: ["goto", LOC_NUGGET]},
-      {verbs: ['FORWA', 'HALL', 'WEST'], action: ["goto", LOC_EASTBANK]},
-      {verbs: ['STAIR', 'D', 'NORTH'], action: ["goto", LOC_KINGHALL]},
-      {verbs: ['UPWAR', 'PIT', 'STEPS', 'DOME', 'PASSA', 'EAST'], cond: [carry OBJ_50], action: ["goto", LOC_DOME]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_PITTOP]},
-      {verbs: ['Y2'], action: ["goto", LOC_JUMBLE]},
+      {verbs: ['LEFT', 'SOUTH'], action: [goto, LOC_NUGGET]},
+      {verbs: ['FORWA', 'HALL', 'WEST'], action: [goto, LOC_EASTBANK]},
+      {verbs: ['STAIR', 'D', 'NORTH'], action: [goto, LOC_KINGHALL]},
+      {verbs: ['UPWAR', 'PIT', 'STEPS', 'DOME', 'PASSA', 'EAST'], cond: [carry, NUGGET], action: [goto, LOC_DOME]},
+      {verbs: ['UPWAR'], action: [goto, LOC_PITTOP]},
+      {verbs: ['Y2'], action: [goto, LOC_JUMBLE]},
     ]
 - LOC_CRACK:
     description:
@@ -760,7 +888,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_PITTOP]},
+      {verbs: [], action: [goto, LOC_PITTOP]},
     ]
 - LOC_EASTBANK:
     description:
@@ -768,11 +896,11 @@ locations: !!omap
       short: 'You''re on east bank of fissure.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['HALL', 'EAST'], action: ["goto", LOC_MISTHALL]},
-      {verbs: ['JUMP'], cond: [not OBJ_12 0], action: ["speak", CROSS_BRIDGE]},
-      {verbs: ['FORWA'], cond: [not OBJ_12 1], action: ["goto", LOC_NOMAKE]},
-      {verbs: ['OVER', 'ACROS', 'WEST', 'CROSS'], cond: [not OBJ_12 1], action: ["speak", NO_CROSS]},
-      {verbs: ['OVER'], action: ["goto", LOC_WESTBANK]},
+      {verbs: ['HALL', 'EAST'], action: [goto, LOC_MISTHALL]},
+      {verbs: ['JUMP'], cond: [not, FISSURE, 0], action: ["speak", CROSS_BRIDGE]},
+      {verbs: ['FORWA'], cond: [not, FISSURE, 1], action: [goto, LOC_NOMAKE]},
+      {verbs: ['OVER', 'ACROS', 'WEST', 'CROSS'], cond: [not, FISSURE, 1], action: ["speak", NO_CROSS]},
+      {verbs: ['OVER'], action: [goto, LOC_WESTBANK]},
     ]
 - LOC_NUGGET:
     description:
@@ -780,7 +908,7 @@ locations: !!omap
       short: 'You''re in nugget-of-gold room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['HALL', 'OUT', 'NORTH'], action: ["goto", LOC_MISTHALL]},
+      {verbs: ['HALL', 'OUT', 'NORTH'], action: [goto, LOC_MISTHALL]},
     ]
 - LOC_KINGHALL:
     description:
@@ -789,14 +917,14 @@ locations: !!omap
     conditions: {DEEP: true}
     hints: [*snake]
     travel: [
-      {verbs: ['STAIR', 'UPWAR', 'EAST'], action: ["goto", LOC_MISTHALL]},
-      {verbs: ['NORTH', 'RIGHT'], cond: [not OBJ_11 0], action: ["goto", LOC_FLOORHOLE]},
-      {verbs: ['SOUTH', 'LEFT'], cond: [not OBJ_11 0], action: ["goto", LOC_SOUTHSIDE]},
-      {verbs: ['WEST', 'FORWA'], cond: [not OBJ_11 0], action: ["goto", LOC_WESTSIDE]},
-      {verbs: ['NORTH'], action: ["goto", LOC_SNAKEBLOCK]},
-      {verbs: ['SW'], cond: [pct 35], action: ["goto", LOC_SECRET3]},
-      {verbs: ['SW'], cond: [with OBJ_11], action: ["goto", LOC_SNAKEBLOCK]},
-      {verbs: ['SECRE'], action: ["goto", LOC_SECRET3]},
+      {verbs: ['STAIR', 'UPWAR', 'EAST'], action: [goto, LOC_MISTHALL]},
+      {verbs: ['NORTH', 'RIGHT'], cond: [not, SNAKE, 0], action: [goto, LOC_FLOORHOLE]},
+      {verbs: ['SOUTH', 'LEFT'], cond: [not, SNAKE, 0], action: [goto, LOC_SOUTHSIDE]},
+      {verbs: ['WEST', 'FORWA'], cond: [not, SNAKE, 0], action: [goto, LOC_WESTSIDE]},
+      {verbs: ['NORTH'], action: [goto, LOC_SNAKEBLOCK]},
+      {verbs: ['SW'], cond: [pct, 35], action: [goto, LOC_SECRET3]},
+      {verbs: ['SW'], cond: ["with", SNAKE], action: [goto, LOC_SNAKEBLOCK]},
+      {verbs: ['SECRE'], action: [goto, LOC_SECRET3]},
     ]
 - LOC_NECKBROKE:
     description:
@@ -804,7 +932,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_NOMAKE:
     description:
@@ -812,7 +940,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_DOME:
     description:
@@ -820,7 +948,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_MISTHALL]},
+      {verbs: [], action: [goto, LOC_MISTHALL]},
     ]
 - LOC_WESTEND:
     description:
@@ -828,9 +956,9 @@ locations: !!omap
       short: 'You''re at west end of Twopit Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST', 'ACROS'], action: ["goto", LOC_EASTEND]},
-      {verbs: ['WEST', 'SLAB'], action: ["goto", LOC_SLAB]},
-      {verbs: ['D', 'PIT'], action: ["goto", LOC_WESTPIT]},
+      {verbs: ['EAST', 'ACROS'], action: [goto, LOC_EASTEND]},
+      {verbs: ['WEST', 'SLAB'], action: [goto, LOC_SLAB]},
+      {verbs: ['D', 'PIT'], action: [goto, LOC_WESTPIT]},
       {verbs: ['HOLE'], action: ["speak", TOO_FAR]},
     ]
 - LOC_EASTPIT:
@@ -839,7 +967,7 @@ locations: !!omap
       short: 'You''re in east pit.'
     conditions: {FLUID: true, DEEP: true, OILY: true}
     travel: [
-      {verbs: ['UPWAR', 'OUT'], action: ["goto", LOC_EASTEND]},
+      {verbs: ['UPWAR', 'OUT'], action: [goto, LOC_EASTEND]},
     ]
 - LOC_WESTPIT:
     description:
@@ -847,9 +975,9 @@ locations: !!omap
       short: 'You''re in west pit.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['UPWAR', 'OUT'], action: ["goto", LOC_WESTEND]},
-      {verbs: ['CLIMB'], cond: [not OBJ_24 2], action: ["goto", LOC_BUILDING1]},
-      {verbs: ['CLIMB'], action: ["goto", LOC_CLIMBSTALK]},
+      {verbs: ['UPWAR', 'OUT'], action: [goto, LOC_WESTEND]},
+      {verbs: ['CLIMB'], cond: [not, PLANT, 2], action: [goto, LOC_BUILDING1]},
+      {verbs: ['CLIMB'], action: [goto, LOC_CLIMBSTALK]},
     ]
 - LOC_CLIMBSTALK:
     description:
@@ -857,7 +985,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NARROW]},
+      {verbs: [], action: [goto, LOC_NARROW]},
     ]
 - LOC_WESTBANK:
     description:
@@ -865,12 +993,12 @@ locations: !!omap
       short: 'You''re on west bank of fissure.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['JUMP'], cond: [not OBJ_12 0], action: ["speak", CROSS_BRIDGE]},
-      {verbs: ['FORWA'], cond: [not OBJ_12 1], action: ["goto", LOC_NOMAKE]},
-      {verbs: ['OVER', 'ACROS', 'EAST', 'CROSS'], cond: [not OBJ_12 1], action: ["speak", NO_CROSS]},
-      {verbs: ['OVER'], action: ["goto", LOC_EASTBANK]},
-      {verbs: ['NORTH'], action: ["goto", LOC_PARALLEL1]},
-      {verbs: ['WEST'], action: ["goto", LOC_MISTWEST]},
+      {verbs: ['JUMP'], cond: [not, FISSURE, 0], action: ["speak", CROSS_BRIDGE]},
+      {verbs: ['FORWA'], cond: [not, FISSURE, 1], action: [goto, LOC_NOMAKE]},
+      {verbs: ['OVER', 'ACROS', 'EAST', 'CROSS'], cond: [not, FISSURE, 1], action: ["speak", NO_CROSS]},
+      {verbs: ['OVER'], action: [goto, LOC_EASTBANK]},
+      {verbs: ['NORTH'], action: [goto, LOC_PARALLEL1]},
+      {verbs: ['WEST'], action: [goto, LOC_MISTWEST]},
     ]
 - LOC_FLOORHOLE:
     description:
@@ -878,9 +1006,9 @@ locations: !!omap
       short: 'You''re in n/s passage above e/w passage.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['HALL', 'OUT', 'SOUTH'], action: ["goto", LOC_KINGHALL]},
-      {verbs: ['NORTH', 'Y2'], action: ["goto", LOC_Y2]},
-      {verbs: ['D', 'HOLE'], action: ["goto", LOC_BROKEN]},
+      {verbs: ['HALL', 'OUT', 'SOUTH'], action: [goto, LOC_KINGHALL]},
+      {verbs: ['NORTH', 'Y2'], action: [goto, LOC_Y2]},
+      {verbs: ['D', 'HOLE'], action: [goto, LOC_BROKEN]},
     ]
 - LOC_SOUTHSIDE:
     description:
@@ -888,7 +1016,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['HALL', 'OUT', 'NORTH'], action: ["goto", LOC_KINGHALL]},
+      {verbs: ['HALL', 'OUT', 'NORTH'], action: [goto, LOC_KINGHALL]},
     ]
 - LOC_WESTSIDE:
     description:
@@ -896,8 +1024,8 @@ locations: !!omap
       short: 'You''re in the west side chamber.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['HALL', 'OUT', 'EAST'], action: ["goto", LOC_KINGHALL]},
-      {verbs: ['WEST', 'UPWAR'], action: ["goto", LOC_CROSSOVER]},
+      {verbs: ['HALL', 'OUT', 'EAST'], action: [goto, LOC_KINGHALL]},
+      {verbs: ['WEST', 'UPWAR'], action: [goto, LOC_CROSSOVER]},
     ]
 - LOC_BUILDING1:
     description:
@@ -905,8 +1033,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], cond: [not OBJ_24 1], action: ["goto", LOC_NOCLIMB]},
-      {verbs: [], action: ["goto", LOC_PLANTTOP]},
+      {verbs: [], cond: [not, PLANT, 1], action: [goto, LOC_NOCLIMB]},
+      {verbs: [], action: [goto, LOC_PLANTTOP]},
     ]
 - LOC_SNAKEBLOCK:
     description:
@@ -914,7 +1042,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_KINGHALL]},
+      {verbs: [], action: [goto, LOC_KINGHALL]},
     ]
 - LOC_Y2:
     description:
@@ -922,12 +1050,12 @@ locations: !!omap
       short: 'You''re at "Y2".'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['PLUGH'], action: ["goto", LOC_FOOF4]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FLOORHOLE]},
-      {verbs: ['EAST', 'WALL', 'BROKE'], action: ["goto", LOC_JUMBLE]},
-      {verbs: ['WEST'], action: ["goto", LOC_WINDOW1]},
-      {verbs: ['PLOVE'], cond: [carry OBJ_59], action: ["special", 2]},
-      {verbs: ['PLOVE'], action: ["goto", LOC_FOOF5]},
+      {verbs: ['PLUGH'], action: [goto, LOC_FOOF4]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FLOORHOLE]},
+      {verbs: ['EAST', 'WALL', 'BROKE'], action: [goto, LOC_JUMBLE]},
+      {verbs: ['WEST'], action: [goto, LOC_WINDOW1]},
+      {verbs: ['PLOVE'], cond: [carry, EMERALD], action: ["special", 2]},
+      {verbs: ['PLOVE'], action: [goto, LOC_FOOF5]},
     ]
 - LOC_JUMBLE:
     description:
@@ -935,8 +1063,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D', 'Y2'], action: ["goto", LOC_Y2]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_MISTHALL]},
+      {verbs: ['D', 'Y2'], action: [goto, LOC_Y2]},
+      {verbs: ['UPWAR'], action: [goto, LOC_MISTHALL]},
     ]
 - LOC_WINDOW1:
     description:
@@ -944,8 +1072,8 @@ locations: !!omap
       short: 'You''re at window on pit.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST', 'Y2'], action: ["goto", LOC_Y2]},
-      {verbs: ['JUMP'], action: ["goto", LOC_NECKBROKE]},
+      {verbs: ['EAST', 'Y2'], action: [goto, LOC_Y2]},
+      {verbs: ['JUMP'], action: [goto, LOC_NECKBROKE]},
     ]
 - LOC_BROKEN:
     description:
@@ -953,10 +1081,10 @@ locations: !!omap
       short: 'You''re in dirty passage.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST', 'CRAWL'], action: ["goto", LOC_SMALLPITBRINK]},
-      {verbs: ['UPWAR', 'HOLE'], action: ["goto", LOC_FLOORHOLE]},
-      {verbs: ['WEST'], action: ["goto", LOC_DUSTY]},
-      {verbs: ['BEDQU'], action: ["goto", LOC_BEDQUILT]},
+      {verbs: ['EAST', 'CRAWL'], action: [goto, LOC_SMALLPITBRINK]},
+      {verbs: ['UPWAR', 'HOLE'], action: [goto, LOC_FLOORHOLE]},
+      {verbs: ['WEST'], action: [goto, LOC_DUSTY]},
+      {verbs: ['BEDQU'], action: [goto, LOC_BEDQUILT]},
     ]
 - LOC_SMALLPITBRINK:
     description:
@@ -964,8 +1092,8 @@ locations: !!omap
       short: 'You''re at brink of small pit.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['WEST', 'CRAWL'], action: ["goto", LOC_BROKEN]},
-      {verbs: ['D', 'PIT', 'CLIMB'], action: ["goto", LOC_SMALLPIT]},
+      {verbs: ['WEST', 'CRAWL'], action: [goto, LOC_BROKEN]},
+      {verbs: ['D', 'PIT', 'CLIMB'], action: [goto, LOC_SMALLPIT]},
     ]
 - LOC_SMALLPIT:
     description:
@@ -974,7 +1102,7 @@ locations: !!omap
     conditions: {FLUID: true, DEEP: true}
     sound: STREAM_GURGLES
     travel: [
-      {verbs: ['CLIMB', 'UPWAR', 'OUT'], action: ["goto", LOC_SMALLPITBRINK]},
+      {verbs: ['CLIMB', 'UPWAR', 'OUT'], action: [goto, LOC_SMALLPITBRINK]},
       {verbs: ['SLIT', 'STREA', 'D', 'UPSTR', 'DOWNS', 'ENTER', 'INWAR'], action: ["speak", DONT_FIT]},
     ]
 - LOC_DUSTY:
@@ -983,9 +1111,9 @@ locations: !!omap
       short: 'You''re in dusty rock room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST', 'PASSA'], action: ["goto", LOC_BROKEN]},
-      {verbs: ['D', 'HOLE', 'FLOOR'], action: ["goto", LOC_COMPLEX]},
-      {verbs: ['BEDQU'], action: ["goto", LOC_BEDQUILT]},
+      {verbs: ['EAST', 'PASSA'], action: [goto, LOC_BROKEN]},
+      {verbs: ['D', 'HOLE', 'FLOOR'], action: [goto, LOC_COMPLEX]},
+      {verbs: ['BEDQU'], action: [goto, LOC_BEDQUILT]},
     ]
 - LOC_PARALLEL1:
     description:
@@ -993,7 +1121,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_MISTWEST]},
+      {verbs: [], action: [goto, LOC_MISTWEST]},
     ]
 - LOC_MISTWEST:
     description:
@@ -1001,10 +1129,10 @@ locations: !!omap
       short: 'You''re at west end of Hall of Mists.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH', 'UPWAR', 'PASSA', 'CLIMB'], action: ["goto", LOC_ALIKE1]},
-      {verbs: ['EAST'], action: ["goto", LOC_WESTBANK]},
-      {verbs: ['NORTH'], action: ["goto", LOC_PARALLEL2]},
-      {verbs: ['WEST', 'CRAWL'], action: ["goto", LOC_LONGEAST]},
+      {verbs: ['SOUTH', 'UPWAR', 'PASSA', 'CLIMB'], action: [goto, LOC_ALIKE1]},
+      {verbs: ['EAST'], action: [goto, LOC_WESTBANK]},
+      {verbs: ['NORTH'], action: [goto, LOC_PARALLEL2]},
+      {verbs: ['WEST', 'CRAWL'], action: [goto, LOC_LONGEAST]},
     ]
 - LOC_ALIKE1:
     description:
@@ -1013,11 +1141,11 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['UPWAR'], action: ["goto", LOC_MISTWEST]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE1]},
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE2]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE4]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE11]},
+      {verbs: ['UPWAR'], action: [goto, LOC_MISTWEST]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE1]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE2]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE4]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE11]},
     ]
 - LOC_ALIKE2:
     description:
@@ -1026,9 +1154,9 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE1]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE3]},
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE4]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE1]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE3]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE4]},
     ]
 - LOC_ALIKE3:
     description:
@@ -1037,10 +1165,10 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE2]},
-      {verbs: ['D'], action: ["goto", LOC_DEADEND3]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE6]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DEADEND9]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE2]},
+      {verbs: ['D'], action: [goto, LOC_DEADEND3]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE6]},
+      {verbs: ['NORTH'], action: [goto, LOC_DEADEND9]},
     ]
 - LOC_ALIKE4:
     description:
@@ -1049,11 +1177,11 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE1]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE2]},
-      {verbs: ['EAST'], action: ["goto", LOC_DEADEND1]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DEADEND2]},
-      {verbs: ['UPWAR', 'D'], action: ["goto", LOC_ALIKE14]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE1]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE2]},
+      {verbs: ['EAST'], action: [goto, LOC_DEADEND1]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DEADEND2]},
+      {verbs: ['UPWAR', 'D'], action: [goto, LOC_ALIKE14]},
     ]
 - LOC_DEADEND1:
     description:
@@ -1062,7 +1190,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST', 'OUT'], action: ["goto", LOC_ALIKE4]},
+      {verbs: ['WEST', 'OUT'], action: [goto, LOC_ALIKE4]},
     ]
 - LOC_DEADEND2:
     description:
@@ -1071,7 +1199,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['EAST', 'OUT'], action: ["goto", LOC_ALIKE4]},
+      {verbs: ['EAST', 'OUT'], action: [goto, LOC_ALIKE4]},
     ]
 - LOC_DEADEND3:
     description:
@@ -1080,7 +1208,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['UPWAR', 'OUT'], action: ["goto", LOC_ALIKE3]},
+      {verbs: ['UPWAR', 'OUT'], action: [goto, LOC_ALIKE3]},
     ]
 - LOC_ALIKE5:
     description:
@@ -1089,8 +1217,8 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE6]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE7]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE6]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE7]},
     ]
 - LOC_ALIKE6:
     description:
@@ -1099,10 +1227,10 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE3]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE5]},
-      {verbs: ['D'], action: ["goto", LOC_ALIKE7]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE8]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE3]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE5]},
+      {verbs: ['D'], action: [goto, LOC_ALIKE7]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE8]},
     ]
 - LOC_ALIKE7:
     description:
@@ -1111,10 +1239,10 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE5]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_ALIKE6]},
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE8]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE9]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE5]},
+      {verbs: ['UPWAR'], action: [goto, LOC_ALIKE6]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE8]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE9]},
     ]
 - LOC_ALIKE8:
     description:
@@ -1123,12 +1251,12 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE6]},
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE7]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE8]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_ALIKE9]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE10]},
-      {verbs: ['D'], action: ["goto", LOC_DEADEND11]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE6]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE7]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE8]},
+      {verbs: ['UPWAR'], action: [goto, LOC_ALIKE9]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE10]},
+      {verbs: ['D'], action: [goto, LOC_DEADEND11]},
     ]
 - LOC_ALIKE9:
     description:
@@ -1137,9 +1265,9 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE7]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE8]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DEADEND4]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE7]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE8]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DEADEND4]},
     ]
 - LOC_DEADEND4:
     description:
@@ -1148,7 +1276,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST', 'OUT'], action: ["goto", LOC_ALIKE9]},
+      {verbs: ['WEST', 'OUT'], action: [goto, LOC_ALIKE9]},
     ]
 - LOC_ALIKE10:
     description:
@@ -1157,10 +1285,10 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE8]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE10]},
-      {verbs: ['D'], action: ["goto", LOC_DEADEND5]},
-      {verbs: ['EAST'], action: ["goto", LOC_PITBRINK]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE8]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE10]},
+      {verbs: ['D'], action: [goto, LOC_DEADEND5]},
+      {verbs: ['EAST'], action: [goto, LOC_PITBRINK]},
     ]
 - LOC_DEADEND5:
     description:
@@ -1169,7 +1297,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['UPWAR', 'OUT'], action: ["goto", LOC_ALIKE10]},
+      {verbs: ['UPWAR', 'OUT'], action: [goto, LOC_ALIKE10]},
     ]
 - LOC_PITBRINK:
     description:
@@ -1177,11 +1305,11 @@ locations: !!omap
       short: 'You''re at brink of pit.'
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['D', 'CLIMB'], action: ["goto", LOC_BIRD]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE10]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DEADEND6]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE12]},
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE13]},
+      {verbs: ['D', 'CLIMB'], action: [goto, LOC_BIRD]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE10]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DEADEND6]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE12]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE13]},
     ]
 - LOC_DEADEND6:
     description:
@@ -1189,7 +1317,7 @@ locations: !!omap
       short: !!null
     conditions: {NOARRR: true, DEEP: true}
     travel: [
-      {verbs: ['EAST', 'OUT'], action: ["goto", LOC_PITBRINK]},
+      {verbs: ['EAST', 'OUT'], action: [goto, LOC_PITBRINK]},
     ]
 - LOC_PARALLEL2:
     description:
@@ -1197,7 +1325,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_WESTBANK]},
+      {verbs: [], action: [goto, LOC_WESTBANK]},
     ]
 - LOC_LONGEAST:
     description:
@@ -1205,9 +1333,9 @@ locations: !!omap
       short: 'You''re at east end of long hall.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST', 'UPWAR', 'CRAWL'], action: ["goto", LOC_MISTWEST]},
-      {verbs: ['WEST'], action: ["goto", LOC_LONGWEST]},
-      {verbs: ['NORTH', 'D', 'HOLE'], action: ["goto", LOC_CROSSOVER]},
+      {verbs: ['EAST', 'UPWAR', 'CRAWL'], action: [goto, LOC_MISTWEST]},
+      {verbs: ['WEST'], action: [goto, LOC_LONGWEST]},
+      {verbs: ['NORTH', 'D', 'HOLE'], action: [goto, LOC_CROSSOVER]},
     ]
 - LOC_LONGWEST:
     description:
@@ -1215,9 +1343,9 @@ locations: !!omap
       short: 'You''re at west end of long hall.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_LONGEAST]},
-      {verbs: ['NORTH'], action: ["goto", LOC_CROSSOVER]},
-      {verbs: ['SOUTH'], cond: [carry OBJ_0], action: ["goto", LOC_DIFFERENT1]},
+      {verbs: ['EAST'], action: [goto, LOC_LONGEAST]},
+      {verbs: ['NORTH'], action: [goto, LOC_CROSSOVER]},
+      {verbs: ['SOUTH'], cond: [carry, OBJ_0], action: [goto, LOC_DIFFERENT1]},
     ]
 - LOC_CROSSOVER:
     description:
@@ -1225,10 +1353,10 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_LONGEAST]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DEADEND7]},
-      {verbs: ['EAST'], action: ["goto", LOC_WESTSIDE]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_LONGWEST]},
+      {verbs: ['WEST'], action: [goto, LOC_LONGEAST]},
+      {verbs: ['NORTH'], action: [goto, LOC_DEADEND7]},
+      {verbs: ['EAST'], action: [goto, LOC_WESTSIDE]},
+      {verbs: ['SOUTH'], action: [goto, LOC_LONGWEST]},
     ]
 - LOC_DEADEND7:
     description:
@@ -1236,7 +1364,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH', 'OUT'], action: ["goto", LOC_CROSSOVER]},
+      {verbs: ['SOUTH', 'OUT'], action: [goto, LOC_CROSSOVER]},
     ]
 - LOC_COMPLEX:
     description:
@@ -1246,10 +1374,10 @@ locations: !!omap
     hints: [*jade]
     sound: WIND_WHISTLES
     travel: [
-      {verbs: ['UPWAR', 'CLIMB', 'ROOM'], action: ["goto", LOC_DUSTY]},
-      {verbs: ['WEST', 'BEDQU'], action: ["goto", LOC_BEDQUILT]},
-      {verbs: ['NORTH', 'SHELL'], action: ["goto", LOC_SHELLROOM]},
-      {verbs: ['EAST'], action: ["goto", LOC_ANTEROOM]},
+      {verbs: ['UPWAR', 'CLIMB', 'ROOM'], action: [goto, LOC_DUSTY]},
+      {verbs: ['WEST', 'BEDQU'], action: [goto, LOC_BEDQUILT]},
+      {verbs: ['NORTH', 'SHELL'], action: [goto, LOC_SHELLROOM]},
+      {verbs: ['EAST'], action: [goto, LOC_ANTEROOM]},
     ]
 - LOC_BEDQUILT:
     description:
@@ -1257,18 +1385,18 @@ locations: !!omap
       short: 'You''re in Bedquilt.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_COMPLEX]},
-      {verbs: ['WEST'], action: ["goto", LOC_SWISSCHEESE]},
-      {verbs: ['SOUTH'], cond: [pct 65], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['SLAB'], action: ["goto", LOC_SLAB]},
-      {verbs: ['UPWAR'], cond: [pct 60], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['UPWAR'], cond: [pct 70], action: ["goto", LOC_SECRET2]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DUSTY]},
-      {verbs: ['NORTH'], cond: [pct 50], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['NORTH'], cond: [pct 75], action: ["goto", LOC_LOWROOM]},
-      {verbs: ['NORTH'], action: ["goto", LOC_THREEJUNCTION]},
-      {verbs: ['D'], cond: [pct 65], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['D'], action: ["goto", LOC_ANTEROOM]},
+      {verbs: ['EAST'], action: [goto, LOC_COMPLEX]},
+      {verbs: ['WEST'], action: [goto, LOC_SWISSCHEESE]},
+      {verbs: ['SOUTH'], cond: [pct, 65], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['SLAB'], action: [goto, LOC_SLAB]},
+      {verbs: ['UPWAR'], cond: [pct, 60], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['UPWAR'], cond: [pct, 70], action: [goto, LOC_SECRET2]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DUSTY]},
+      {verbs: ['NORTH'], cond: [pct, 50], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['NORTH'], cond: [pct, 75], action: [goto, LOC_LOWROOM]},
+      {verbs: ['NORTH'], action: [goto, LOC_THREEJUNCTION]},
+      {verbs: ['D'], cond: [pct, 65], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['D'], action: [goto, LOC_ANTEROOM]},
     ]
 - LOC_SWISSCHEESE:
     description:
@@ -1276,13 +1404,13 @@ locations: !!omap
       short: 'You''re in Swiss Cheese Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NE'], action: ["goto", LOC_BEDQUILT]},
-      {verbs: ['WEST'], action: ["goto", LOC_EASTEND]},
-      {verbs: ['SOUTH'], cond: [pct 80], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['CANYO'], action: ["goto", LOC_TALL]},
-      {verbs: ['EAST'], action: ["goto", LOC_SOFTROOM]},
-      {verbs: ['NW'], cond: [pct 50], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['ORIEN'], action: ["goto", LOC_ORIENTAL]},
+      {verbs: ['NE'], action: [goto, LOC_BEDQUILT]},
+      {verbs: ['WEST'], action: [goto, LOC_EASTEND]},
+      {verbs: ['SOUTH'], cond: [pct, 80], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['CANYO'], action: [goto, LOC_TALL]},
+      {verbs: ['EAST'], action: [goto, LOC_SOFTROOM]},
+      {verbs: ['NW'], cond: [pct, 50], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['ORIEN'], action: [goto, LOC_ORIENTAL]},
     ]
 - LOC_EASTEND:
     description:
@@ -1290,9 +1418,9 @@ locations: !!omap
       short: 'You''re at east end of Twopit Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_SWISSCHEESE]},
-      {verbs: ['WEST', 'ACROS'], action: ["goto", LOC_WESTEND]},
-      {verbs: ['D', 'PIT'], action: ["goto", LOC_EASTPIT]},
+      {verbs: ['EAST'], action: [goto, LOC_SWISSCHEESE]},
+      {verbs: ['WEST', 'ACROS'], action: [goto, LOC_WESTEND]},
+      {verbs: ['D', 'PIT'], action: [goto, LOC_EASTPIT]},
     ]
 - LOC_SLAB:
     description:
@@ -1300,9 +1428,9 @@ locations: !!omap
       short: 'You''re in Slab Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_WESTEND]},
-      {verbs: ['UPWAR', 'CLIMB'], action: ["goto", LOC_SECRET1]},
-      {verbs: ['NORTH'], action: ["goto", LOC_BEDQUILT]},
+      {verbs: ['SOUTH'], action: [goto, LOC_WESTEND]},
+      {verbs: ['UPWAR', 'CLIMB'], action: [goto, LOC_SECRET1]},
+      {verbs: ['NORTH'], action: [goto, LOC_BEDQUILT]},
     ]
 - LOC_SECRET1:
     description:
@@ -1310,11 +1438,11 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D', 'SLAB'], action: ["goto", LOC_SLAB]},
-      {verbs: ['SOUTH'], cond: [not OBJ_31 0], action: ["goto", LOC_SECRET5]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_SECRET4]},
-      {verbs: ['NORTH'], action: ["goto", LOC_MIRRORCANYON]},
-      {verbs: ['RESER'], action: ["goto", LOC_RESERVOIR]},
+      {verbs: ['D', 'SLAB'], action: [goto, LOC_SLAB]},
+      {verbs: ['SOUTH'], cond: [not, DRAGON, 0], action: [goto, LOC_SECRET5]},
+      {verbs: ['SOUTH'], action: [goto, LOC_SECRET4]},
+      {verbs: ['NORTH'], action: [goto, LOC_MIRRORCANYON]},
+      {verbs: ['RESER'], action: [goto, LOC_RESERVOIR]},
     ]
 - LOC_SECRET2:
     description:
@@ -1322,9 +1450,9 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_THREEJUNCTION]},
-      {verbs: ['D', 'PASSA'], action: ["goto", LOC_BEDQUILT]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_TOPSTALACTITE]},
+      {verbs: ['NORTH'], action: [goto, LOC_THREEJUNCTION]},
+      {verbs: ['D', 'PASSA'], action: [goto, LOC_BEDQUILT]},
+      {verbs: ['SOUTH'], action: [goto, LOC_TOPSTALACTITE]},
     ]
 - LOC_THREEJUNCTION:
     description:
@@ -1332,9 +1460,9 @@ locations: !!omap
       short: 'You''re at junction of three secret canyons.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SE'], action: ["goto", LOC_BEDQUILT]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_SECRET2]},
-      {verbs: ['NORTH'], action: ["goto", LOC_WINDOW2]},
+      {verbs: ['SE'], action: [goto, LOC_BEDQUILT]},
+      {verbs: ['SOUTH'], action: [goto, LOC_SECRET2]},
+      {verbs: ['NORTH'], action: [goto, LOC_WINDOW2]},
     ]
 - LOC_LOWROOM:
     description:
@@ -1342,10 +1470,10 @@ locations: !!omap
       short: 'You''re in large low room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['BEDQU'], action: ["goto", LOC_BEDQUILT]},
-      {verbs: ['SW'], action: ["goto", LOC_WINDING]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DEADCRAWL]},
-      {verbs: ['SE', 'ORIEN'], action: ["goto", LOC_ORIENTAL]},
+      {verbs: ['BEDQU'], action: [goto, LOC_BEDQUILT]},
+      {verbs: ['SW'], action: [goto, LOC_WINDING]},
+      {verbs: ['NORTH'], action: [goto, LOC_DEADCRAWL]},
+      {verbs: ['SE', 'ORIEN'], action: [goto, LOC_ORIENTAL]},
     ]
 - LOC_DEADCRAWL:
     description:
@@ -1353,7 +1481,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH', 'CRAWL', 'OUT'], action: ["goto", LOC_LOWROOM]},
+      {verbs: ['SOUTH', 'CRAWL', 'OUT'], action: [goto, LOC_LOWROOM]},
     ]
 - LOC_SECRET3:
     description:
@@ -1361,10 +1489,10 @@ locations: !!omap
       short: 'You''re in secret e/w canyon above tight canyon.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_KINGHALL]},
-      {verbs: ['WEST'], cond: [not OBJ_31 0], action: ["goto", LOC_SECRET5]},
-      {verbs: ['WEST'], action: ["goto", LOC_SECRET6]},
-      {verbs: ['D'], action: ["goto", LOC_WIDEPLACE]},
+      {verbs: ['EAST'], action: [goto, LOC_KINGHALL]},
+      {verbs: ['WEST'], cond: [not, DRAGON, 0], action: [goto, LOC_SECRET5]},
+      {verbs: ['WEST'], action: [goto, LOC_SECRET6]},
+      {verbs: ['D'], action: [goto, LOC_WIDEPLACE]},
     ]
 - LOC_WIDEPLACE:
     description:
@@ -1372,8 +1500,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_TIGHTPLACE]},
-      {verbs: ['NORTH'], action: ["goto", LOC_TALL]},
+      {verbs: ['SOUTH'], action: [goto, LOC_TIGHTPLACE]},
+      {verbs: ['NORTH'], action: [goto, LOC_TALL]},
     ]
 - LOC_TIGHTPLACE:
     description:
@@ -1381,7 +1509,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_WIDEPLACE]},
+      {verbs: ['NORTH'], action: [goto, LOC_WIDEPLACE]},
     ]
 - LOC_TALL:
     description:
@@ -1389,9 +1517,9 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_WIDEPLACE]},
-      {verbs: ['WEST'], action: ["goto", LOC_BOULDERS1]},
-      {verbs: ['NORTH', 'CRAWL'], action: ["goto", LOC_SWISSCHEESE]},
+      {verbs: ['EAST'], action: [goto, LOC_WIDEPLACE]},
+      {verbs: ['WEST'], action: [goto, LOC_BOULDERS1]},
+      {verbs: ['NORTH', 'CRAWL'], action: [goto, LOC_SWISSCHEESE]},
     ]
 - LOC_BOULDERS1:
     description:
@@ -1399,7 +1527,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_TALL]},
+      {verbs: ['SOUTH'], action: [goto, LOC_TALL]},
     ]
 - LOC_SEWER:
     description:
@@ -1407,7 +1535,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_BUILDING]},
+      {verbs: [], action: [goto, LOC_BUILDING]},
     ]
 - LOC_ALIKE11:
     description:
@@ -1416,10 +1544,10 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_ALIKE1]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE11]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_ALIKE11]},
-      {verbs: ['EAST'], action: ["goto", LOC_DEADEND8]},
+      {verbs: ['NORTH'], action: [goto, LOC_ALIKE1]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE11]},
+      {verbs: ['SOUTH'], action: [goto, LOC_ALIKE11]},
+      {verbs: ['EAST'], action: [goto, LOC_DEADEND8]},
     ]
 - LOC_DEADEND8:
     description:
@@ -1428,7 +1556,7 @@ locations: !!omap
     conditions: {DEEP: true}
     hints: [*maze]
     travel: [
-      {verbs: ['WEST', 'OUT'], action: ["goto", LOC_ALIKE11]},
+      {verbs: ['WEST', 'OUT'], action: [goto, LOC_ALIKE11]},
     ]
 - LOC_DEADEND9:
     description:
@@ -1437,7 +1565,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['SOUTH', 'OUT'], action: ["goto", LOC_ALIKE3]},
+      {verbs: ['SOUTH', 'OUT'], action: [goto, LOC_ALIKE3]},
     ]
 - LOC_ALIKE12:
     description:
@@ -1445,9 +1573,9 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_PITBRINK]},
-      {verbs: ['EAST'], action: ["goto", LOC_ALIKE13]},
-      {verbs: ['WEST'], action: ["goto", LOC_DEADEND10]},
+      {verbs: ['SOUTH'], action: [goto, LOC_PITBRINK]},
+      {verbs: ['EAST'], action: [goto, LOC_ALIKE13]},
+      {verbs: ['WEST'], action: [goto, LOC_DEADEND10]},
     ]
 - LOC_ALIKE13:
     description:
@@ -1455,9 +1583,9 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_PITBRINK]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALIKE12]},
-      {verbs: ['NW'], action: ["goto", LOC_DEADEND12]},
+      {verbs: ['NORTH'], action: [goto, LOC_PITBRINK]},
+      {verbs: ['WEST'], action: [goto, LOC_ALIKE12]},
+      {verbs: ['NW'], action: [goto, LOC_DEADEND12]},
     ]
 - LOC_DEADEND10:
     description:
@@ -1465,7 +1593,7 @@ locations: !!omap
       short: !!null
     conditions: {NOARRR: true, DEEP: true}
     travel: [
-      {verbs: ['EAST', 'OUT'], action: ["goto", LOC_ALIKE12]},
+      {verbs: ['EAST', 'OUT'], action: [goto, LOC_ALIKE12]},
     ]
 - LOC_DEADEND11:
     description:
@@ -1474,7 +1602,7 @@ locations: !!omap
     conditions: {DEEP: true, NOARRR: true}
     hints: [*maze]
     travel: [
-      {verbs: ['UPWAR', 'OUT'], action: ["goto", LOC_ALIKE8]},
+      {verbs: ['UPWAR', 'OUT'], action: [goto, LOC_ALIKE8]},
     ]
 - LOC_ALIKE14:
     description:
@@ -1483,7 +1611,7 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*maze]
     travel: [
-      {verbs: ['UPWAR', 'D'], action: ["goto", LOC_ALIKE4]},
+      {verbs: ['UPWAR', 'D'], action: [goto, LOC_ALIKE4]},
     ]
 - LOC_NARROW:
     description:
@@ -1491,9 +1619,9 @@ locations: !!omap
       short: 'You''re in narrow corridor.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D', 'CLIMB', 'EAST'], action: ["goto", LOC_WESTPIT]},
-      {verbs: ['JUMP'], action: ["goto", LOC_NECKBROKE]},
-      {verbs: ['WEST', 'GIANT'], action: ["goto", LOC_GIANTROOM]},
+      {verbs: ['D', 'CLIMB', 'EAST'], action: [goto, LOC_WESTPIT]},
+      {verbs: ['JUMP'], action: [goto, LOC_NECKBROKE]},
+      {verbs: ['WEST', 'GIANT'], action: [goto, LOC_GIANTROOM]},
     ]
 - LOC_NOCLIMB:
     description:
@@ -1501,7 +1629,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_WESTPIT]},
+      {verbs: [], action: [goto, LOC_WESTPIT]},
     ]
 - LOC_PLANTTOP:
     description:
@@ -1509,7 +1637,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_WESTEND]},
+      {verbs: [], action: [goto, LOC_WESTEND]},
     ]
 - LOC_INCLINE:
     description:
@@ -1517,8 +1645,8 @@ locations: !!omap
       short: 'You''re at steep incline above large room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH', 'CAVER', 'PASSA'], action: ["goto", LOC_WATERFALL]},
-      {verbs: ['D', 'CLIMB'], action: ["goto", LOC_LOWROOM]},
+      {verbs: ['NORTH', 'CAVER', 'PASSA'], action: [goto, LOC_WATERFALL]},
+      {verbs: ['D', 'CLIMB'], action: [goto, LOC_LOWROOM]},
     ]
 - LOC_GIANTROOM:
     description:
@@ -1526,9 +1654,9 @@ locations: !!omap
       short: 'You''re in Giant Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_NARROW]},
-      {verbs: ['EAST'], action: ["goto", LOC_CAVEIN]},
-      {verbs: ['NORTH'], action: ["goto", LOC_IMMENSE]},
+      {verbs: ['SOUTH'], action: [goto, LOC_NARROW]},
+      {verbs: ['EAST'], action: [goto, LOC_CAVEIN]},
+      {verbs: ['NORTH'], action: [goto, LOC_IMMENSE]},
     ]
 - LOC_CAVEIN:
     description:
@@ -1536,7 +1664,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH', 'GIANT', 'OUT'], action: ["goto", LOC_GIANTROOM]},
+      {verbs: ['SOUTH', 'GIANT', 'OUT'], action: [goto, LOC_GIANTROOM]},
     ]
 - LOC_IMMENSE:
     description:
@@ -1545,8 +1673,8 @@ locations: !!omap
     conditions: {DEEP: true}
     sound: WIND_WHISTLES
     travel: [
-      {verbs: ['SOUTH', 'GIANT', 'PASSA'], action: ["goto", LOC_GIANTROOM]},
-      {verbs: ['NORTH', 'ENTER', 'CAVER'], cond: [not OBJ_9 0], action: ["goto", LOC_WATERFALL]},
+      {verbs: ['SOUTH', 'GIANT', 'PASSA'], action: [goto, LOC_GIANTROOM]},
+      {verbs: ['NORTH', 'ENTER', 'CAVER'], cond: [not, DOOR, 0], action: [goto, LOC_WATERFALL]},
       {verbs: ['NORTH'], action: ["speak", RUSTY_DOOR]},
     ]
 - LOC_WATERFALL:
@@ -1556,9 +1684,9 @@ locations: !!omap
     conditions: {FLUID: true, DEEP: true}
     sound: STREAM_SPLASHES
     travel: [
-      {verbs: ['SOUTH', 'OUT'], action: ["goto", LOC_IMMENSE]},
-      {verbs: ['GIANT'], action: ["goto", LOC_GIANTROOM]},
-      {verbs: ['WEST'], action: ["goto", LOC_INCLINE]},
+      {verbs: ['SOUTH', 'OUT'], action: [goto, LOC_IMMENSE]},
+      {verbs: ['GIANT'], action: [goto, LOC_GIANTROOM]},
+      {verbs: ['WEST'], action: [goto, LOC_INCLINE]},
     ]
 - LOC_SOFTROOM:
     description:
@@ -1566,7 +1694,7 @@ locations: !!omap
       short: 'You''re in Soft Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['WEST', 'OUT'], action: ["goto", LOC_SWISSCHEESE]},
+      {verbs: ['WEST', 'OUT'], action: [goto, LOC_SWISSCHEESE]},
     ]
 - LOC_ORIENTAL:
     description:
@@ -1574,9 +1702,9 @@ locations: !!omap
       short: 'You''re in Oriental Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SE'], action: ["goto", LOC_SWISSCHEESE]},
-      {verbs: ['WEST', 'CRAWL'], action: ["goto", LOC_LOWROOM]},
-      {verbs: ['UPWAR', 'NORTH', 'CAVER'], action: ["goto", LOC_MISTY]},
+      {verbs: ['SE'], action: [goto, LOC_SWISSCHEESE]},
+      {verbs: ['WEST', 'CRAWL'], action: [goto, LOC_LOWROOM]},
+      {verbs: ['UPWAR', 'NORTH', 'CAVER'], action: [goto, LOC_MISTY]},
     ]
 - LOC_MISTY:
     description:
@@ -1585,8 +1713,8 @@ locations: !!omap
     conditions: {DEEP: true}
     sound: NO_MEANING
     travel: [
-      {verbs: ['SOUTH', 'ORIEN'], action: ["goto", LOC_ORIENTAL]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALCOVE]},
+      {verbs: ['SOUTH', 'ORIEN'], action: [goto, LOC_ORIENTAL]},
+      {verbs: ['WEST'], action: [goto, LOC_ALCOVE]},
     ]
 - LOC_ALCOVE:
     description:
@@ -1595,9 +1723,9 @@ locations: !!omap
     conditions: {DEEP: true}
     hints: [*dark]
     travel: [
-      {verbs: ['NW', 'CAVER'], action: ["goto", LOC_MISTY]},
+      {verbs: ['NW', 'CAVER'], action: [goto, LOC_MISTY]},
       {verbs: ['EAST', 'PASSA'], action: ["special", 1]},
-      {verbs: ['EAST'], action: ["goto", LOC_PLOVER]},
+      {verbs: ['EAST'], action: [goto, LOC_PLOVER]},
     ]
 - LOC_PLOVER:
     description:
@@ -1607,10 +1735,10 @@ locations: !!omap
     hints: [*dark]
     travel: [
       {verbs: ['WEST', 'PASSA', 'OUT'], action: ["special", 1]},
-      {verbs: ['WEST'], action: ["goto", LOC_ALCOVE]},
-      {verbs: ['PLOVE'], cond: [carry OBJ_59], action: ["special", 2]},
-      {verbs: ['PLOVE'], action: ["goto", LOC_FOOF6]},
-      {verbs: ['NE', 'DARK'], action: ["goto", LOC_DARKROOM]},
+      {verbs: ['WEST'], action: [goto, LOC_ALCOVE]},
+      {verbs: ['PLOVE'], cond: [carry, EMERALD], action: ["special", 2]},
+      {verbs: ['PLOVE'], action: [goto, LOC_FOOF6]},
+      {verbs: ['NE', 'DARK'], action: [goto, LOC_DARKROOM]},
     ]
 - LOC_DARKROOM:
     description:
@@ -1619,7 +1747,7 @@ locations: !!omap
     conditions: {DEEP: true}
     hints: [*dark]
     travel: [
-      {verbs: ['SOUTH', 'PLOVE', 'OUT'], action: ["goto", LOC_PLOVER]},
+      {verbs: ['SOUTH', 'PLOVE', 'OUT'], action: [goto, LOC_PLOVER]},
     ]
 - LOC_ARCHED:
     description:
@@ -1627,7 +1755,7 @@ locations: !!omap
       short: 'You''re in arched hall.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D', 'SHELL', 'OUT'], action: ["goto", LOC_SHELLROOM]},
+      {verbs: ['D', 'SHELL', 'OUT'], action: [goto, LOC_SHELLROOM]},
     ]
 - LOC_SHELLROOM:
     description:
@@ -1635,11 +1763,11 @@ locations: !!omap
       short: 'You''re in Shell Room.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['UPWAR', 'HALL'], action: ["goto", LOC_ARCHED]},
-      {verbs: ['D'], action: ["goto", LOC_SLOPING1]},
-      {verbs: ['SOUTH'], cond: [carry OBJ_14], action: ["speak", CLAM_BLOCKER]},
-      {verbs: ['SOUTH'], cond: [carry OBJ_15], action: ["speak", OYSTER_BLOCKER]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_COMPLEX]},
+      {verbs: ['UPWAR', 'HALL'], action: [goto, LOC_ARCHED]},
+      {verbs: ['D'], action: [goto, LOC_SLOPING1]},
+      {verbs: ['SOUTH'], cond: [carry, CLAM], action: ["speak", CLAM_BLOCKER]},
+      {verbs: ['SOUTH'], cond: [carry, OYSTER], action: ["speak", OYSTER_BLOCKER]},
+      {verbs: ['SOUTH'], action: [goto, LOC_COMPLEX]},
     ]
 - LOC_SLOPING1:
     description:
@@ -1647,8 +1775,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['UPWAR', 'SHELL'], action: ["goto", LOC_SHELLROOM]},
-      {verbs: ['D'], action: ["goto", LOC_CULDESAC]},
+      {verbs: ['UPWAR', 'SHELL'], action: [goto, LOC_SHELLROOM]},
+      {verbs: ['D'], action: [goto, LOC_CULDESAC]},
     ]
 - LOC_CULDESAC:
     description:
@@ -1656,8 +1784,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['UPWAR', 'OUT'], action: ["goto", LOC_SLOPING1]},
-      {verbs: ['SHELL'], action: ["goto", LOC_SHELLROOM]},
+      {verbs: ['UPWAR', 'OUT'], action: [goto, LOC_SLOPING1]},
+      {verbs: ['SHELL'], action: [goto, LOC_SHELLROOM]},
     ]
 - LOC_ANTEROOM:
     description:
@@ -1665,9 +1793,9 @@ locations: !!omap
       short: 'You''re in anteroom.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['UPWAR'], action: ["goto", LOC_COMPLEX]},
-      {verbs: ['WEST'], action: ["goto", LOC_BEDQUILT]},
-      {verbs: ['EAST'], action: ["goto", LOC_WITTSEND]},
+      {verbs: ['UPWAR'], action: [goto, LOC_COMPLEX]},
+      {verbs: ['WEST'], action: [goto, LOC_BEDQUILT]},
+      {verbs: ['EAST'], action: [goto, LOC_WITTSEND]},
     ]
 - LOC_DIFFERENT1:
     description:
@@ -1675,16 +1803,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['D'], action: ["goto", LOC_LONGWEST]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['D'], action: [goto, LOC_LONGWEST]},
     ]
 - LOC_WITTSEND:
     description:
@@ -1693,8 +1821,8 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     hints: [*witt]
     travel: [
-      {verbs: ['EAST', 'NORTH', 'SOUTH', 'NE', 'SE', 'SW', 'NW', 'UPWAR', 'D'], cond: [pct 95], action: ["speak", FUTILE_CRAWL]},
-      {verbs: ['EAST'], action: ["goto", LOC_ANTEROOM]},
+      {verbs: ['EAST', 'NORTH', 'SOUTH', 'NE', 'SE', 'SW', 'NW', 'UPWAR', 'D'], cond: [pct, 95], action: ["speak", FUTILE_CRAWL]},
+      {verbs: ['EAST'], action: [goto, LOC_ANTEROOM]},
       {verbs: ['WEST'], action: ["speak", WAY_BLOCKED]},
     ]
 - LOC_MIRRORCANYON:
@@ -1705,8 +1833,8 @@ locations: !!omap
     hints: [*jade]
     sound: WIND_WHISTLES
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_SECRET1]},
-      {verbs: ['NORTH', 'RESER'], action: ["goto", LOC_RESERVOIR]},
+      {verbs: ['SOUTH'], action: [goto, LOC_SECRET1]},
+      {verbs: ['NORTH', 'RESER'], action: [goto, LOC_RESERVOIR]},
     ]
 - LOC_WINDOW2:
     description:
@@ -1714,8 +1842,8 @@ locations: !!omap
       short: 'You''re at window on pit.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_THREEJUNCTION]},
-      {verbs: ['JUMP'], action: ["goto", LOC_NECKBROKE]},
+      {verbs: ['WEST'], action: [goto, LOC_THREEJUNCTION]},
+      {verbs: ['JUMP'], action: [goto, LOC_NECKBROKE]},
     ]
 - LOC_TOPSTALACTITE:
     description:
@@ -1723,10 +1851,10 @@ locations: !!omap
       short: 'You''re at top of stalactite.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_SECRET2]},
-      {verbs: ['D', 'JUMP', 'CLIMB'], cond: [pct 40], action: ["goto", LOC_ALIKE6]},
-      {verbs: ['D'], cond: [pct 50], action: ["goto", LOC_ALIKE9]},
-      {verbs: ['D'], action: ["goto", LOC_ALIKE4]},
+      {verbs: ['NORTH'], action: [goto, LOC_SECRET2]},
+      {verbs: ['D', 'JUMP', 'CLIMB'], cond: [pct, 40], action: [goto, LOC_ALIKE6]},
+      {verbs: ['D'], cond: [pct, 50], action: [goto, LOC_ALIKE9]},
+      {verbs: ['D'], action: [goto, LOC_ALIKE4]},
     ]
 - LOC_DIFFERENT2:
     description:
@@ -1734,16 +1862,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DEADEND13]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DEADEND13]},
     ]
 - LOC_RESERVOIR:
     description:
@@ -1752,9 +1880,9 @@ locations: !!omap
     conditions: {FLUID: true, DEEP: true}
     sound: STREAM_SPLASHES
     travel: [
-      {verbs: ['SOUTH', 'OUT'], action: ["goto", LOC_MIRRORCANYON]},
-      {verbs: ['NORTH', 'ACROS', 'CROSS'], cond: [not OBJ_45 1], action: ["speak", BAD_DIRECTION]},
-      {verbs: ['NORTH'], action: ["goto", LOC_RESBOTTOM]},
+      {verbs: ['SOUTH', 'OUT'], action: [goto, LOC_MIRRORCANYON]},
+      {verbs: ['NORTH', 'ACROS', 'CROSS'], cond: [not, RESER, 1], action: ["speak", BAD_DIRECTION]},
+      {verbs: ['NORTH'], action: [goto, LOC_RESBOTTOM]},
     ]
 - LOC_DEADEND12:
     description:
@@ -1762,7 +1890,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SE'], action: ["goto", LOC_ALIKE13]},
+      {verbs: ['SE'], action: [goto, LOC_ALIKE13]},
     ]
 - LOC_NE:
     description:
@@ -1771,7 +1899,7 @@ locations: !!omap
     conditions: {DEEP: true, LIT: true}
     sound: MURMURING_SNORING
     travel: [
-      {verbs: ['SW'], action: ["goto", LOC_SW]},
+      {verbs: ['SW'], action: [goto, LOC_SW]},
     ]
 - LOC_SW:
     description:
@@ -1780,7 +1908,7 @@ locations: !!omap
     conditions: {DEEP: true, LIT: true}
     sound: SNAKES_HISSING
     travel: [
-      {verbs: ['NE'], action: ["goto", LOC_NE]},
+      {verbs: ['NE'], action: [goto, LOC_NE]},
       {verbs: ['D'], action: ["speak", GRATE_NOWAY]},
     ]
 - LOC_SWCHASM:
@@ -1789,11 +1917,11 @@ locations: !!omap
       short: 'You''re on sw side of chasm.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SW'], action: ["goto", LOC_WINDING]},
-      {verbs: ['OVER', 'ACROS', 'CROSS', 'NE'], cond: [with OBJ_33], action: ["speak", TROLL_BLOCKS]},
-      {verbs: ['OVER'], cond: [not OBJ_32 0], action: ["speak", BRIDGE_GONE]},
+      {verbs: ['SW'], action: [goto, LOC_WINDING]},
+      {verbs: ['OVER', 'ACROS', 'CROSS', 'NE'], cond: [with, TROLL], action: ["speak", TROLL_BLOCKS]},
+      {verbs: ['OVER'], cond: [not, CHASM, 0], action: ["speak", BRIDGE_GONE]},
       {verbs: ['OVER'], action: ["special", 3]},
-      {verbs: ['JUMP'], cond: [not OBJ_32 0], action: ["goto", LOC_NOMAKE]},
+      {verbs: ['JUMP'], cond: [not, CHASM, 0], action: [goto, LOC_NOMAKE]},
       {verbs: ['JUMP'], action: ["speak", CROSS_BRIDGE]},
     ]
 - LOC_WINDING:
@@ -1802,8 +1930,8 @@ locations: !!omap
       short: 'You''re in sloping corridor.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D'], action: ["goto", LOC_LOWROOM]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_SWCHASM]},
+      {verbs: ['D'], action: [goto, LOC_LOWROOM]},
+      {verbs: ['UPWAR'], action: [goto, LOC_SWCHASM]},
     ]
 - LOC_SECRET4:
     description:
@@ -1811,7 +1939,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH', 'OUT'], action: ["goto", LOC_SECRET1]},
+      {verbs: ['NORTH', 'OUT'], action: [goto, LOC_SECRET1]},
       {verbs: ['EAST', 'FORWA'], action: ["speak", NASTY_DRAGON]},
     ]
 - LOC_SECRET5:
@@ -1820,8 +1948,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_SECRET1]},
-      {verbs: ['EAST'], action: ["goto", LOC_SECRET3]},
+      {verbs: ['NORTH'], action: [goto, LOC_SECRET1]},
+      {verbs: ['EAST'], action: [goto, LOC_SECRET3]},
     ]
 - LOC_SECRET6:
     description:
@@ -1829,7 +1957,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['EAST', 'OUT'], action: ["goto", LOC_SECRET3]},
+      {verbs: ['EAST', 'OUT'], action: [goto, LOC_SECRET3]},
       {verbs: ['NORTH', 'FORWA'], action: ["speak", NASTY_DRAGON]},
     ]
 - LOC_NECHASM:
@@ -1838,13 +1966,13 @@ locations: !!omap
       short: 'You''re on ne side of chasm.'
     conditions: {NOARRR: true, DEEP: true}
     travel: [
-      {verbs: ['NE'], action: ["goto", LOC_CORRIDOR]},
-      {verbs: ['OVER', 'ACROS', 'CROSS', 'SW'], cond: [with OBJ_33], action: ["speak", TROLL_BLOCKS]},
+      {verbs: ['NE'], action: [goto, LOC_CORRIDOR]},
+      {verbs: ['OVER', 'ACROS', 'CROSS', 'SW'], cond: [with, TROLL], action: ["speak", TROLL_BLOCKS]},
       {verbs: ['OVER'], action: ["special", 3]},
       {verbs: ['JUMP'], action: ["speak", CROSS_BRIDGE]},
-      {verbs: ['FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
-      {verbs: ['BARRE'], action: ["goto", LOC_BARRENFRONT]},
+      {verbs: ['FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
+      {verbs: ['BARRE'], action: [goto, LOC_BARRENFRONT]},
     ]
 - LOC_CORRIDOR:
     description:
@@ -1853,10 +1981,10 @@ locations: !!omap
     conditions: {NOARRR: true, DEEP: true}
     sound: DULL_RUMBLING
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_NECHASM]},
-      {verbs: ['EAST', 'FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
-      {verbs: ['BARRE'], action: ["goto", LOC_BARRENFRONT]},
+      {verbs: ['WEST'], action: [goto, LOC_NECHASM]},
+      {verbs: ['EAST', 'FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
+      {verbs: ['BARRE'], action: [goto, LOC_BARRENFRONT]},
     ]
 - LOC_FORK:
     description:
@@ -1865,11 +1993,11 @@ locations: !!omap
     conditions: {NOARRR: true, DEEP: true}
     sound: DULL_RUMBLING
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_CORRIDOR]},
-      {verbs: ['NE', 'LEFT'], action: ["goto", LOC_WARMWALLS]},
-      {verbs: ['SE', 'RIGHT', 'D'], action: ["goto", LOC_LIMESTONE]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
-      {verbs: ['BARRE'], action: ["goto", LOC_BARRENFRONT]},
+      {verbs: ['WEST'], action: [goto, LOC_CORRIDOR]},
+      {verbs: ['NE', 'LEFT'], action: [goto, LOC_WARMWALLS]},
+      {verbs: ['SE', 'RIGHT', 'D'], action: [goto, LOC_LIMESTONE]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
+      {verbs: ['BARRE'], action: [goto, LOC_BARRENFRONT]},
     ]
 - LOC_WARMWALLS:
     description:
@@ -1878,9 +2006,9 @@ locations: !!omap
     conditions: {NOARRR: true, DEEP: true}
     sound: LOUD_ROAR
     travel: [
-      {verbs: ['SOUTH', 'FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['NORTH', 'VIEW'], action: ["goto", LOC_BREATHTAKING]},
-      {verbs: ['EAST', 'CRAWL'], action: ["goto", LOC_BOULDERS2]},
+      {verbs: ['SOUTH', 'FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['NORTH', 'VIEW'], action: [goto, LOC_BREATHTAKING]},
+      {verbs: ['EAST', 'CRAWL'], action: [goto, LOC_BOULDERS2]},
     ]
 - LOC_BREATHTAKING:
     description:
@@ -1891,10 +2019,10 @@ locations: !!omap
     sound: TOTAL_ROAR
     loud: true
     travel: [
-      {verbs: ['SOUTH', 'PASSA', 'OUT'], action: ["goto", LOC_WARMWALLS]},
-      {verbs: ['FORK'], action: ["goto", LOC_FORK]},
+      {verbs: ['SOUTH', 'PASSA', 'OUT'], action: [goto, LOC_WARMWALLS]},
+      {verbs: ['FORK'], action: [goto, LOC_FORK]},
       {verbs: ['D'], action: ["speak", RIDICULOUS_ATTEMPT]},
-      {verbs: ['JUMP'], action: ["goto", LOC_GRUESOME]},
+      {verbs: ['JUMP'], action: [goto, LOC_GRUESOME]},
     ]
 - LOC_BOULDERS2:
     description:
@@ -1903,9 +2031,9 @@ locations: !!omap
     conditions: {NOARRR: true, DEEP: true}
     sound: DULL_RUMBLING
     travel: [
-      {verbs: ['WEST', 'OUT', 'CRAWL'], action: ["goto", LOC_WARMWALLS]},
-      {verbs: ['FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
+      {verbs: ['WEST', 'OUT', 'CRAWL'], action: [goto, LOC_WARMWALLS]},
+      {verbs: ['FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
     ]
 - LOC_LIMESTONE:
     description:
@@ -1913,9 +2041,9 @@ locations: !!omap
       short: 'You''re in limestone passage.'
     conditions: {NOARRR: true, DEEP: true}
     travel: [
-      {verbs: ['NORTH', 'UPWAR', 'FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['SOUTH', 'D', 'BARRE'], action: ["goto", LOC_BARRENFRONT]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
+      {verbs: ['NORTH', 'UPWAR', 'FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['SOUTH', 'D', 'BARRE'], action: [goto, LOC_BARRENFRONT]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
     ]
 - LOC_BARRENFRONT:
     description:
@@ -1923,10 +2051,10 @@ locations: !!omap
       short: 'You''re in front of Barren Room.'
     conditions: {NOARRR: true, DEEP: true}
     travel: [
-      {verbs: ['WEST', 'UPWAR'], action: ["goto", LOC_LIMESTONE]},
-      {verbs: ['FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['EAST', 'INWAR', 'BARRE', 'ENTER'], action: ["goto", LOC_BARRENROOM]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
+      {verbs: ['WEST', 'UPWAR'], action: [goto, LOC_LIMESTONE]},
+      {verbs: ['FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['EAST', 'INWAR', 'BARRE', 'ENTER'], action: [goto, LOC_BARRENROOM]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
     ]
 - LOC_BARRENROOM:
     description:
@@ -1934,9 +2062,9 @@ locations: !!omap
       short: 'You''re in Barren Room.'
     conditions: {NOARRR: true, DEEP: true}
     travel: [
-      {verbs: ['WEST', 'OUT'], action: ["goto", LOC_BARRENFRONT]},
-      {verbs: ['FORK'], action: ["goto", LOC_FORK]},
-      {verbs: ['VIEW'], action: ["goto", LOC_BREATHTAKING]},
+      {verbs: ['WEST', 'OUT'], action: [goto, LOC_BARRENFRONT]},
+      {verbs: ['FORK'], action: [goto, LOC_FORK]},
+      {verbs: ['VIEW'], action: [goto, LOC_BREATHTAKING]},
     ]
 - LOC_DIFFERENT3:
     description:
@@ -1944,16 +2072,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT4:
     description:
@@ -1961,16 +2089,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT5:
     description:
@@ -1978,16 +2106,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT6:
     description:
@@ -1995,16 +2123,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT7:
     description:
@@ -2012,16 +2140,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT8:
     description:
@@ -2029,16 +2157,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT9:
     description:
@@ -2046,16 +2174,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT10:
     description:
@@ -2063,16 +2191,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT11]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT11]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT11:
     description:
@@ -2080,16 +2208,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: ['SW'], action: ["goto", LOC_DIFFERENT1]},
-      {verbs: ['NW'], action: ["goto", LOC_DIFFERENT3]},
-      {verbs: ['EAST'], action: ["goto", LOC_DIFFERENT4]},
-      {verbs: ['WEST'], action: ["goto", LOC_DIFFERENT5]},
-      {verbs: ['NORTH'], action: ["goto", LOC_DIFFERENT6]},
-      {verbs: ['D'], action: ["goto", LOC_DIFFERENT7]},
-      {verbs: ['SE'], action: ["goto", LOC_DIFFERENT8]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_DIFFERENT9]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_DIFFERENT10]},
-      {verbs: ['NE'], action: ["goto", LOC_DIFFERENT2]},
+      {verbs: ['SW'], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['NW'], action: [goto, LOC_DIFFERENT3]},
+      {verbs: ['EAST'], action: [goto, LOC_DIFFERENT4]},
+      {verbs: ['WEST'], action: [goto, LOC_DIFFERENT5]},
+      {verbs: ['NORTH'], action: [goto, LOC_DIFFERENT6]},
+      {verbs: ['D'], action: [goto, LOC_DIFFERENT7]},
+      {verbs: ['SE'], action: [goto, LOC_DIFFERENT8]},
+      {verbs: ['UPWAR'], action: [goto, LOC_DIFFERENT9]},
+      {verbs: ['SOUTH'], action: [goto, LOC_DIFFERENT10]},
+      {verbs: ['NE'], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DEADEND13:
     description:
@@ -2097,9 +2225,9 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH', 'OUT'], action: ["goto", LOC_DIFFERENT2]},
-      {verbs: ['SOUTH'], cond: [not OBJ_38 0], action: ["goto", LOC_ROUGHHEWN]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_BADDIRECTION]},
+      {verbs: ['NORTH', 'OUT'], action: [goto, LOC_DIFFERENT2]},
+      {verbs: ['SOUTH'], cond: [not, VEND, 0], action: [goto, LOC_ROUGHHEWN]},
+      {verbs: ['SOUTH'], action: [goto, LOC_BADDIRECTION]},
     ]
 - LOC_ROUGHHEWN:
     description:
@@ -2107,8 +2235,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_DEADEND13]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_LARGE]},
+      {verbs: ['NORTH'], action: [goto, LOC_DEADEND13]},
+      {verbs: ['SOUTH'], action: [goto, LOC_LARGE]},
     ]
 - LOC_BADDIRECTION:
     description:
@@ -2116,7 +2244,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_DEADEND13]},
+      {verbs: [], action: [goto, LOC_DEADEND13]},
     ]
 - LOC_LARGE:
     description:
@@ -2125,9 +2253,9 @@ locations: !!omap
     conditions: {DEEP: true}
     hints: [*ogre]
     travel: [
-      {verbs: ['WEST'], action: ["goto", LOC_ROUGHHEWN]},
-      {verbs: ['NORTH'], cond: [with OBJ_41], action: ["speak", OGRE_SNARL]},
-      {verbs: ['NORTH'], action: ["goto", LOC_STOREROOM]},
+      {verbs: ['WEST'], action: [goto, LOC_ROUGHHEWN]},
+      {verbs: ['NORTH'], cond: [with, OGRE], action: ["speak", OGRE_SNARL]},
+      {verbs: ['NORTH'], action: [goto, LOC_STOREROOM]},
     ]
 - LOC_STOREROOM:
     description:
@@ -2135,7 +2263,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH', 'OUT'], action: ["goto", LOC_LARGE]},
+      {verbs: ['SOUTH', 'OUT'], action: [goto, LOC_LARGE]},
     ]
 - LOC_FOREST1:
     description:
@@ -2144,10 +2272,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_START]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST13]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST2]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST3]},
+      {verbs: ['EAST'], action: [goto, LOC_START]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST13]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST2]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST3]},
     ]
 - LOC_FOREST2:
     description:
@@ -2156,10 +2284,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST1]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST19]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST3]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST18]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST1]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST19]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST3]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST18]},
     ]
 - LOC_FOREST3:
     description:
@@ -2168,9 +2296,9 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST', 'WEST'], action: ["goto", LOC_FOREST4]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST2]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST1]},
+      {verbs: ['EAST', 'WEST'], action: [goto, LOC_FOREST4]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST2]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST1]},
     ]
 - LOC_FOREST4:
     description:
@@ -2179,8 +2307,8 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST', 'NORTH'], action: ["goto", LOC_FOREST3]},
-      {verbs: ['WEST', 'SOUTH'], action: ["goto", LOC_FOREST5]},
+      {verbs: ['EAST', 'NORTH'], action: [goto, LOC_FOREST3]},
+      {verbs: ['WEST', 'SOUTH'], action: [goto, LOC_FOREST5]},
     ]
 - LOC_FOREST5:
     description:
@@ -2189,9 +2317,9 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST', 'NORTH'], action: ["goto", LOC_FOREST4]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST7]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST6]},
+      {verbs: ['EAST', 'NORTH'], action: [goto, LOC_FOREST4]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST7]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST6]},
     ]
 - LOC_FOREST6:
     description:
@@ -2200,10 +2328,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST5]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST7]},
-      {verbs: ['NORTH'], action: ["goto", LOC_VALLEY]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_SLIT]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST5]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST7]},
+      {verbs: ['NORTH'], action: [goto, LOC_VALLEY]},
+      {verbs: ['SOUTH'], action: [goto, LOC_SLIT]},
     ]
 - LOC_FOREST7:
     description:
@@ -2212,10 +2340,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST5]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST6]},
-      {verbs: ['NORTH'], action: ["goto", LOC_GRATE]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST8]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST5]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST6]},
+      {verbs: ['NORTH'], action: [goto, LOC_GRATE]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST8]},
     ]
 - LOC_FOREST8:
     description:
@@ -2224,10 +2352,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST9]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST11]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST22]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST7]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST9]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST11]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST22]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST7]},
     ]
 - LOC_FOREST9:
     description:
@@ -2236,10 +2364,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST11]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST8]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST10]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_GRATE]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST11]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST8]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST10]},
+      {verbs: ['SOUTH'], action: [goto, LOC_GRATE]},
     ]
 - LOC_FOREST10:
     description:
@@ -2248,10 +2376,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_SLIT]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST11]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST9]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_GRATE]},
+      {verbs: ['EAST'], action: [goto, LOC_SLIT]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST11]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST9]},
+      {verbs: ['SOUTH'], action: [goto, LOC_GRATE]},
     ]
 - LOC_FOREST11:
     description:
@@ -2260,10 +2388,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST10]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST8]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST22]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST9]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST10]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST8]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST22]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST9]},
     ]
 - LOC_FOREST12:
     description:
@@ -2272,10 +2400,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST13]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST14]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST22]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_VALLEY]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST13]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST14]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST22]},
+      {verbs: ['SOUTH'], action: [goto, LOC_VALLEY]},
     ]
 - LOC_FOREST13:
     description:
@@ -2284,10 +2412,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST1]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST12]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST20]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_HILL]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST1]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST12]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST20]},
+      {verbs: ['SOUTH'], action: [goto, LOC_HILL]},
     ]
 - LOC_FOREST14:
     description:
@@ -2296,10 +2424,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_ROADEND]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST16]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST15]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST12]},
+      {verbs: ['EAST'], action: [goto, LOC_ROADEND]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST16]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST15]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST12]},
     ]
 - LOC_FOREST15:
     description:
@@ -2308,10 +2436,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST16]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST22]},
-      {verbs: ['NORTH'], action: ["goto", LOC_ROADEND]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST14]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST16]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST22]},
+      {verbs: ['NORTH'], action: [goto, LOC_ROADEND]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST14]},
     ]
 - LOC_FOREST16:
     description:
@@ -2320,9 +2448,9 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST', 'NORTH'], action: ["goto", LOC_FOREST17]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST14]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST15]},
+      {verbs: ['EAST', 'NORTH'], action: [goto, LOC_FOREST17]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST14]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST15]},
     ]
 - LOC_FOREST17:
     description:
@@ -2331,9 +2459,9 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST18]},
-      {verbs: ['WEST', 'SOUTH'], action: ["goto", LOC_FOREST16]},
-      {verbs: ['NORTH'], action: ["goto", LOC_CLIFF]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST18]},
+      {verbs: ['WEST', 'SOUTH'], action: [goto, LOC_FOREST16]},
+      {verbs: ['NORTH'], action: [goto, LOC_CLIFF]},
     ]
 - LOC_FOREST18:
     description:
@@ -2342,10 +2470,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST19]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST17]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST2]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST21]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST19]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST17]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST2]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST21]},
     ]
 - LOC_FOREST19:
     description:
@@ -2354,10 +2482,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST2]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST18]},
-      {verbs: ['NORTH'], action: ["goto", LOC_CLIFF]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST20]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST2]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST18]},
+      {verbs: ['NORTH'], action: [goto, LOC_CLIFF]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST20]},
     ]
 - LOC_FOREST20:
     description:
@@ -2366,10 +2494,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_HILL]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST21]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST19]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST13]},
+      {verbs: ['EAST'], action: [goto, LOC_HILL]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST21]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST19]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST13]},
     ]
 - LOC_FOREST21:
     description:
@@ -2378,10 +2506,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST20]},
-      {verbs: ['WEST'], action: ["goto", LOC_ROADEND]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST18]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST21]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST20]},
+      {verbs: ['WEST'], action: [goto, LOC_ROADEND]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST18]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST21]},
     ]
 - LOC_FOREST22:
     description:
@@ -2390,10 +2518,10 @@ locations: !!omap
     conditions: {FOREST: true, NOBACK: true, LIT: true}
     hints: [*forest]
     travel: [
-      {verbs: ['EAST'], action: ["goto", LOC_FOREST8]},
-      {verbs: ['WEST'], action: ["goto", LOC_FOREST11]},
-      {verbs: ['NORTH'], action: ["goto", LOC_FOREST15]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_FOREST12]},
+      {verbs: ['EAST'], action: [goto, LOC_FOREST8]},
+      {verbs: ['WEST'], action: [goto, LOC_FOREST11]},
+      {verbs: ['NORTH'], action: [goto, LOC_FOREST15]},
+      {verbs: ['SOUTH'], action: [goto, LOC_FOREST12]},
     ]
 - LOC_LEDGE:
     description:
@@ -2401,7 +2529,7 @@ locations: !!omap
       short: 'You''re on ledge.'
     conditions: {ABOVE: true, LIT: true}
     travel: [
-      {verbs: ['JUMP'], action: ["goto", LOC_NOMAKE]},
+      {verbs: ['JUMP'], action: [goto, LOC_NOMAKE]},
     ]
 - LOC_RESBOTTOM:
     description:
@@ -2411,8 +2539,8 @@ locations: !!omap
     sound: TOTAL_ROAR
     loud: true
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_RESNORTH]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_RESERVOIR]},
+      {verbs: ['NORTH'], action: [goto, LOC_RESNORTH]},
+      {verbs: ['SOUTH'], action: [goto, LOC_RESERVOIR]},
     ]
 - LOC_RESNORTH:
     description:
@@ -2421,9 +2549,9 @@ locations: !!omap
     conditions: {FLUID: true, DEEP: true}
     sound: WATERS_CRASHING
     travel: [
-      {verbs: ['SOUTH', 'ACROS', 'CROSS'], cond: [not OBJ_45 1], action: ["speak", BAD_DIRECTION]},
-      {verbs: ['SOUTH'], action: ["goto", LOC_RESBOTTOM]},
-      {verbs: ['NW', 'UPWAR', 'OUT'], action: ["goto", LOC_TREACHEROUS]},
+      {verbs: ['SOUTH', 'ACROS', 'CROSS'], cond: [not, RESER, 1], action: ["speak", BAD_DIRECTION]},
+      {verbs: ['SOUTH'], action: [goto, LOC_RESBOTTOM]},
+      {verbs: ['NW', 'UPWAR', 'OUT'], action: [goto, LOC_TREACHEROUS]},
     ]
 - LOC_TREACHEROUS:
     description:
@@ -2431,8 +2559,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['UPWAR', 'NW'], action: ["goto", LOC_STEEP]},
-      {verbs: ['D', 'SE'], action: ["goto", LOC_RESNORTH]},
+      {verbs: ['UPWAR', 'NW'], action: [goto, LOC_STEEP]},
+      {verbs: ['D', 'SE'], action: [goto, LOC_RESNORTH]},
     ]
 - LOC_STEEP:
     description:
@@ -2440,8 +2568,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D', 'SE'], action: ["goto", LOC_TREACHEROUS]},
-      {verbs: ['UPWAR', 'NW'], action: ["goto", LOC_CLIFFBASE]},
+      {verbs: ['D', 'SE'], action: [goto, LOC_TREACHEROUS]},
+      {verbs: ['UPWAR', 'NW'], action: [goto, LOC_CLIFFBASE]},
     ]
 - LOC_CLIFFBASE:
     description:
@@ -2449,8 +2577,8 @@ locations: !!omap
       short: 'You''re at base of cliff.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D', 'SE'], action: ["goto", LOC_STEEP]},
-      {verbs: ['UPWAR', 'CLIMB'], action: ["goto", LOC_CLIFFACE]},
+      {verbs: ['D', 'SE'], action: [goto, LOC_STEEP]},
+      {verbs: ['UPWAR', 'CLIMB'], action: [goto, LOC_CLIFFACE]},
     ]
 - LOC_CLIFFACE:
     description:
@@ -2458,9 +2586,9 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['D'], action: ["goto", LOC_CLIFFBASE]},
-      {verbs: ['UPWAR'], cond: [carry OBJ_46], action: ["goto", LOC_CLIFFTOP]},
-      {verbs: ['UPWAR'], action: ["goto", LOC_FOOTSLIP]},
+      {verbs: ['D'], action: [goto, LOC_CLIFFBASE]},
+      {verbs: ['UPWAR'], cond: [carry, OBJ_46], action: [goto, LOC_CLIFFTOP]},
+      {verbs: ['UPWAR'], action: [goto, LOC_FOOTSLIP]},
     ]
 - LOC_FOOTSLIP:
     description:
@@ -2468,7 +2596,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_CLIFFTOP:
     description:
@@ -2476,7 +2604,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_CLIFFLEDGE]},
+      {verbs: [], action: [goto, LOC_CLIFFLEDGE]},
     ]
 - LOC_CLIFFLEDGE:
     description:
@@ -2484,8 +2612,8 @@ locations: !!omap
       short: 'You''re at top of cliff.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['CLIMB', 'D'], action: ["goto", LOC_CLIFFACE]},
-      {verbs: ['NE', 'CRAWL'], action: ["goto", LOC_REACHDEAD]},
+      {verbs: ['CLIMB', 'D'], action: [goto, LOC_CLIFFACE]},
+      {verbs: ['NE', 'CRAWL'], action: [goto, LOC_REACHDEAD]},
     ]
 - LOC_REACHDEAD:
     description:
@@ -2493,7 +2621,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SW', 'OUT', 'CRAWL'], action: ["goto", LOC_CLIFFLEDGE]},
+      {verbs: ['SW', 'OUT', 'CRAWL'], action: [goto, LOC_CLIFFLEDGE]},
     ]
 - LOC_GRUESOME:
     description:
@@ -2501,7 +2629,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_FOOF1:
     description:
@@ -2509,7 +2637,7 @@ locations: !!omap
       short: !!null
     conditions: {}
     travel: [
-      {verbs: [], action: ["goto", LOC_DEBRIS]},
+      {verbs: [], action: [goto, LOC_DEBRIS]},
     ]
 - LOC_FOOF2:
     description:
@@ -2517,7 +2645,7 @@ locations: !!omap
       short: !!null
     conditions: {ABOVE: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_BUILDING]},
+      {verbs: [], action: [goto, LOC_BUILDING]},
     ]
 - LOC_FOOF3:
     description:
@@ -2525,7 +2653,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_Y2]},
+      {verbs: [], action: [goto, LOC_Y2]},
     ]
 - LOC_FOOF4:
     description:
@@ -2533,7 +2661,7 @@ locations: !!omap
       short: !!null
     conditions: {ABOVE: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_BUILDING]},
+      {verbs: [], action: [goto, LOC_BUILDING]},
     ]
 - LOC_FOOF5:
     description:
@@ -2541,13 +2669,16 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_PLOVER]},
+      {verbs: [], action: [goto, LOC_PLOVER]},
     ]
 - LOC_FOOF6:
     description:
       long: '>>Foof!<<'
       short: !!null
     conditions: {DEEP: true}
+    travel: [
+      {verbs: [], action: [goto, LOC_Y2]},
+    ]
 
 arbitrary_messages:  !!omap
 - NO_MESSAGE: !!null
@@ -2871,51 +3002,59 @@ turn_thresholds:
   point_loss: 10
   message: 'Good grief, don''t you *EVER* give up?  Do you realize you''ve spent\nover 2500 turns at this?  That''s another ten points off, a total of\ntwenty points lost for taking so long.'
   
-object_descriptions: !!omap
+objects: !!omap
 - OBJ_0:
     inventory: !!null
     longs: !!null
-- OBJ_1:
+- KEYS:
+    words: ['keys', 'key']
     inventory: 'Set of keys'
     locations: LOC_BUILDING
     longs:
     - 'There are some keys on the ground here.'
-- OBJ_2:
+- LAMP:
+    words: ['lamp', 'lante']
     inventory: 'Brass lantern'
     locations: LOC_BUILDING
     longs:
     - [LAMP_DARK, 'There is a shiny brass lamp nearby.']
     - [LAMP_BRIGHT, 'There is a lamp shining nearby.']
-- OBJ_3:
+- GRATE:
+    words: ['grate']
     inventory: '*grate'
     locations: [LOC_GRATE, LOC_BELOWGRATE]
     immovable: true
     longs:
     - [GRATE_CLOSED, 'The grate is locked.']
     - [GRATE_OPEN, 'The grate is open.']
-- OBJ_4:
+- CAGE:
+    words: ['cage']
     inventory: 'Wicker cage'
     locations: LOC_COBBLE
     longs:
     - 'There is a small wicker cage discarded nearby.'
-- OBJ_5:
+- ROD:
+    words: ['rod']
     inventory: 'Black rod'
     locations: LOC_DEBRIS
     longs:
     - 'A three foot black rod with a rusty star on an end lies nearby.'
-- OBJ_6:
+- ROD2:
+    words: ['rod']
     inventory: 'Black rod'
     locations: LOC_NOWHERE
     longs:
     - 'A three foot black rod with a rusty mark on an end lies nearby.'
-- OBJ_7:
+- STEPS:
+    words: ['steps']
     inventory: '*steps'
     locations: [LOC_PITTOP, LOC_MISTHALL]
     immovable: true
     longs:
     - 'Rough stone steps lead down the pit.'
     - 'Rough stone steps lead up the dome.'
-- OBJ_8:
+- BIRD:
+    words: ['bird']
     inventory: 'Little bird in cage'
     locations: LOC_BIRD
     longs:
@@ -2929,19 +3068,22 @@ object_descriptions: !!omap
     - 'To your surprise, you can understand the bird''s chirping; it is\nsinging about the joys of its forest home.'
     - 'The bird does not seem inclined to sing while in the cage.'
     - 'The bird is singing to you in gratitude for your having returned it to\nits home.  In return, it informs you of a magic word which it thinks\nyou may find useful somewhere near the Hall of Mists.  The magic word\nchanges frequently, but for now the bird believes it is "%s".  You\nthank the bird for this information, and it flies off into the forest.'
-- OBJ_9:
+- DOOR:
+    words: ['door']
     inventory: '*rusty door'
     locations: LOC_IMMENSE
     immovable: true
     longs:
     - 'The way north is barred by a massive, rusty, iron door.'
     - 'The way north leads through a massive, rusty, iron door.'
-- OBJ_10:
+- PILLOW:
+    words: ['pillo', 'velve']
     inventory: 'Velvet pillow'
     locations: LOC_SOFTROOM
     longs:
     - 'A small velvet pillow lies on the floor.'
-- OBJ_11:
+- SNAKE:
+    words: ['snake']
     inventory: '*snake'
     locations: LOC_KINGHALL
     immovable: true
@@ -2950,7 +3092,8 @@ object_descriptions: !!omap
     - '' # chased away
     sounds:
     - 'The snake is hissing venomously.'
-- OBJ_12:
+- FISSURE:
+    words: ['fissu']
     inventory: '*fissure'
     locations: [LOC_EASTBANK, LOC_WESTBANK]
     immovable: true
@@ -2959,6 +3102,7 @@ object_descriptions: !!omap
     - 'A crystal bridge now spans the fissure.'
     - 'The crystal bridge has vanished!'
 - OBJ_13:
+    words: ['table']
     inventory: '*stone tablet'
     locations: LOC_DARKROOM
     immovable: true
@@ -2966,14 +3110,16 @@ object_descriptions: !!omap
     - 'A massive stone tablet imbedded in the wall reads:\n"Congratulations on bringing light into the dark-room!"'
     texts:
     - '"Congratulations on bringing light into the dark-room!"'
-- OBJ_14:
+- CLAM:
+    words: ['clam']
     inventory: 'Giant clam  >GRUNT!<'
     locations: LOC_SHELLROOM
     longs:
     - 'There is an enormous clam here with its shell tightly closed.'
     sounds:
     - 'The clam is as tight-mouthed as a, er, clam.'
-- OBJ_15:
+- OYSTER:
+    words: ['oyste']
     inventory: 'Giant oyster  >GROAN!<'
     locations: LOC_NOWHERE
     longs:
@@ -2982,48 +3128,57 @@ object_descriptions: !!omap
     sounds:
     - 'Even though it''s an oyster, the critter''s as tight-mouthed as a clam.'
     - 'It says the same thing it did before.  Hm, maybe it''s a pun?'
-- OBJ_16:
+- MAGAZINE:
+    words: ['issue', 'spelu', '"spel']
     inventory: '"Spelunker Today"'
     locations: LOC_ANTEROOM
     longs:
     - 'There are a few recent issues of "Spelunker Today" magazine here.'
     texts:
     - 'I''m afraid the magazine is written in dwarvish.  But pencilled on one\ncover you see, "Please leave the magazines at the construction site."'
-- OBJ_17:
+- DWARF:
+    words: ['dwarf', 'dwarv']
     inventory: !!null
     locations: LOC_NOWHERE
     immovable: true
     longs: !!null
-- OBJ_18:
+- KNIFE:
+    words: ['knife', 'knive']
     inventory: !!null
     locations: LOC_NOWHERE
     longs: !!null
-- OBJ_19:
+- FOOD:
+    words: ['food', 'ratio']
     inventory: 'Tasty food'
     locations: LOC_BUILDING
     longs:
     - 'There is food here.'
-- OBJ_20:
+- BOTTLE:
+    words: ['bottl', 'jar']
     inventory: 'Small bottle'
     locations: LOC_BUILDING
     longs:
     - [WATER_BOTTLE, 'There is a bottle of water here.']
     - [EMPTY_BOTTLE, 'There is an empty bottle here.']
     - [OIL_BOTTLE, 'There is a bottle of oil here.']
-- OBJ_21:
+- WATER:
+    words: ['water', 'h2o']
     inventory: 'Water in the bottle'
     locations: LOC_NOWHERE
     longs: !!null
-- OBJ_22:
+- OIL:
+    words: ['oil']
     inventory: 'Oil in the bottle'
     locations: LOC_NOWHERE
     longs: !!null
-- OBJ_23:
+- MIRROR:
+    words: ['mirro']
     inventory: '*mirror'
     locations: LOC_MIRRORCANYON
     immovable: true
     longs: !!null
-- OBJ_24:
+- PLANT:
+    words: ['plant', 'beans']
     inventory: '*plant'
     locations: LOC_WESTPIT
     immovable: true
@@ -3038,7 +3193,8 @@ object_descriptions: !!omap
     - 'The plant continues to ask plaintively for water.'
     - 'The plant continues to demand water.'
     - 'The plant now maintains a contented silence.'
-- OBJ_25:
+- PLANT2:
+    words: ['plant']
     inventory: '*phony plant' # seen in Twopit Room only when tall enough
     locations: [LOC_WESTEND, LOC_EASTEND]
     immovable: true
@@ -3047,34 +3203,40 @@ object_descriptions: !!omap
     - 'The top of a 12-foot-tall beanstalk is poking out of the west pit.'
     - 'There is a huge beanstalk growing out of the west pit up to the hole.'
 - OBJ_26:
+    words: ['stala']
     inventory: '*stalactite'
     locations: LOC_TOPSTALACTITE
     immovable: true
     longs:
     - ''
 - OBJ_27:
+    words: ['shado', 'figur', 'windo']
     inventory: '*shadowy figure and/or window'
     locations: [LOC_WINDOW1, LOC_WINDOW2]
     immovable: true
     longs:
     - 'The shadowy figure seems to be trying to attract your attention.'
-- OBJ_28:
+- AXE:
+    words: ['axe']
     inventory: 'Dwarf''s axe'
     locations: LOC_NOWHERE
     longs:
     - 'There is a little axe here.'
     - 'There is a little axe lying beside the bear.'
 - OBJ_29:
+    words: ['drawi']
     inventory: '*cave drawings'
     locations: LOC_ORIENTAL
     immovable: true
     longs: !!null
 - OBJ_30:
+    words: ['pirat', 'genie', 'djinn']
     inventory: '*pirate/genie'
     locations: LOC_NOWHERE
     immovable: true
     longs: !!null # never present
-- OBJ_31:
+- DRAGON:
+    words: ['drago']
     inventory: '*dragon'
     locations: [LOC_SECRET4, LOC_SECRET6]
     immovable: true
@@ -3087,14 +3249,16 @@ object_descriptions: !!omap
     - 'The dragon''s ominous hissing does not bode well for you.'
     - 'The dragon is, not surprisingly, silent.'
     - 'The dragon is, not surprisingly, silent.'
-- OBJ_32:
+- CHASM:
+    words: ['chasm']
     inventory: '*chasm'
     locations: [LOC_SWCHASM, LOC_NECHASM]
     immovable: true
     longs:
     - 'A rickety wooden bridge extends across the chasm, vanishing into the\nmist.  A notice posted on the bridge reads, "Stop! Pay troll!"'
     - 'The wreckage of a bridge (and a dead bear) can be seen at the bottom\nof the chasm.'
-- OBJ_33:
+- TROLL:
+    words: ['troll']
     inventory: '*troll'
     locations: [LOC_SWCHASM, LOC_NECHASM]
     immovable: true
@@ -3104,13 +3268,15 @@ object_descriptions: !!omap
     - '' # chased away
     sounds:
     - 'The troll sounds quite adamant in his demand for a treasure.'
-- OBJ_34:
+- TROLL2:
+    words: ['troll']
     inventory: '*phony troll'
     locations: [LOC_NOWHERE, LOC_NOWHERE]
     immovable: true
     longs:
     - 'The troll is nowhere to be seen.'
-- OBJ_35:
+- BEAR:
+    words: ['bear']
     inventory: !!null # bear uses rtext 141
     locations: LOC_BARRENROOM
     immovable: true
@@ -3119,7 +3285,8 @@ object_descriptions: !!omap
     - 'There is a gentle cave bear sitting placidly in one corner.'
     - 'There is a contented-looking bear wandering about nearby.'
     - '' # dead
-- OBJ_36:
+- MESSAG:
+    words: ['messa']
     inventory: '*message in second maze'
     locations: LOC_NOWHERE
     immovable: true
@@ -3127,12 +3294,14 @@ object_descriptions: !!omap
     - 'There is a message scrawled in the dust in a flowery script, reading:\n"This is not the maze where the pirate leaves his treasure chest."'
     texts:
     - '"This is not the maze where the pirate leaves his treasure chest."'
-- OBJ_37:
+- VOLCANO:
+    words: ['volca', 'geyse']
     inventory: '*volcano and/or geyser'
     locations: LOC_BREATHTAKING
     immovable: true
     longs: !!null
-- OBJ_38:
+- VEND:
+    words: ['machi', 'vendi']
     inventory: '*vending machine'
     locations: LOC_DEADEND13
     immovable: true
@@ -3142,18 +3311,21 @@ object_descriptions: !!omap
     texts:
     - '"Drop coins here to receive fresh batteries."'
     - '"Drop coins here to receive fresh batteries."'
-- OBJ_39:
+- BATTERY:
+    words: ['batte']
     inventory: 'Batteries'
     locations: LOC_NOWHERE
     longs:
     - [FRESH_BATTERIES, 'There are fresh batteries here.']
     - [DEAD_BATTERIES, 'Some worn-out batteries have been discarded nearby.']
 - OBJ_40:
+    words: ['carpe', 'moss']
     inventory: '*carpet and/or moss and/or curtains'
     locations: LOC_SOFTROOM
     immovable: true
     longs: !!null
-- OBJ_41:
+- OGRE:
+    words: ['ogre']
     inventory: '*ogre'
     locations: LOC_LARGE
     immovable: true
@@ -3161,7 +3333,8 @@ object_descriptions: !!omap
     - 'A formidable ogre bars the northern exit.'
     sounds:
     - 'The ogre is apparently the strong, silent type.'
-- OBJ_42:
+- URN:
+    words: ['urn']
     inventory: '*urn'
     locations: LOC_CLIFF
     immovable: true
@@ -3169,20 +3342,23 @@ object_descriptions: !!omap
     - 'A small urn is embedded in the rock.'
     - 'A small urn full of oil is embedded in the rock.'
     - 'A small oil flame extrudes from an urn embedded in the rock.'
-- OBJ_43:
+- CAVITY:
+    words: ['cavit']
     inventory: '*cavity'
     locations: LOC_NOWHERE
     immovable: true
     longs:
     - '' # something in it
     - 'There is a small urn-shaped cavity in the rock.'
-- OBJ_44:
+- BLOOD:
+    words: ['blood']
     inventory: '*blood'
     locations: LOC_NOWHERE
     immovable: true
     longs:
     - '' # described with dragon
-- OBJ_45:
+- RESER:
+    words: ['reser']
     inventory: '*reservoir'
     locations: [LOC_RESERVOIR, LOC_RESNORTH]
     immovable: true
@@ -3191,11 +3367,13 @@ object_descriptions: !!omap
     - 'The waters have parted to form a narrow path across the reservoir.'
     - 'The waters crash together again.'
 - OBJ_46:
+    words: ['appen', 'lepor']
     inventory: 'Leporine appendage'
     locations: LOC_FOREST22
     longs:
     - 'Your keen eye spots a severed leporine appendage lying on the ground.'
 - OBJ_47:
+    words: ['mud']
     inventory: '*mud'
     locations: LOC_DEBRIS
     immovable: true
@@ -3204,6 +3382,7 @@ object_descriptions: !!omap
     texts:
     - '"MAGIC WORD XYZZY"'
 - OBJ_48:
+    words: ['note']
     inventory: '*note'
     locations: LOC_NUGGET
     immovable: true
@@ -3211,7 +3390,8 @@ object_descriptions: !!omap
     - ''
     texts:
     - '"You won''t get it up the steps"'
-- OBJ_49:
+- SIGN:
+    words: ['sign']
     inventory: '*sign'
     locations: LOC_ANTEROOM
     immovable: true
@@ -3221,43 +3401,50 @@ object_descriptions: !!omap
     texts:
     - 'Cave under construction beyond this point.\n           Proceed at own risk.\n       [Witt Construction Company]'
     - '"Treasure Vault.  Keys in main office."'
-- OBJ_50:
+- NUGGET:
+    words: ['gold', 'nugge']
     inventory: 'Large gold nugget'
     locations: LOC_NUGGET
     treasure: true
     longs:
     - 'There is a large sparkling nugget of gold here!'
 - OBJ_51:
+    words: ['diamo']
     inventory: 'Several diamonds'
     locations: LOC_WESTBANK
     treasure: true
     longs:
     - 'There are diamonds here!'
 - OBJ_52:
+    words: ['silve', 'bars']
     inventory: 'Bars of silver'
     locations: LOC_FLOORHOLE
     treasure: true
     longs:
     - 'There are bars of silver here!'
 - OBJ_53:
+    words: ['jewel']
     inventory: 'Precious jewelry'
     locations: LOC_SOUTHSIDE
     treasure: true
     longs:
     - 'There is precious jewelry here!'
-- OBJ_54:
+- COINS:
+    words: ['coins']
     inventory: 'Rare coins'
     locations: LOC_WESTSIDE
     treasure: true
     longs:
     - 'There are many coins here!'
-- OBJ_55:
+- CHEST:
+    words: ['chest', 'box', 'treas']
     inventory: 'Treasure chest'
     locations: LOC_NOWHERE
     treasure: true
     longs:
     - 'The pirate''s treasure chest is here!'
-- OBJ_56:
+- EGGS:
+    words: ['eggs', 'egg', 'nest']
     inventory: 'Golden eggs'
     locations: LOC_GIANTROOM
     treasure: true
@@ -3265,13 +3452,15 @@ object_descriptions: !!omap
     - 'There is a large nest here, full of golden eggs!'
     - 'The nest of golden eggs has vanished!'
     - 'Done!'
-- OBJ_57:
+- TRIDENT:
+    words: ['tride']
     inventory: 'Jeweled trident'
     locations: LOC_WATERFALL
     treasure: true
     longs:
     - 'There is a jewel-encrusted trident here!'
-- OBJ_58:
+- VASE:
+    words: ['vase', 'ming', 'shard', 'potte']
     inventory: 'Ming vase'
     locations: LOC_ORIENTAL
     treasure: true
@@ -3280,26 +3469,30 @@ object_descriptions: !!omap
     - [VASE_RESTING, 'The vase is now resting, delicately, on a velvet pillow.']
     - [VASE_BROKEN, 'The floor is littered with worthless shards of pottery.']
     - [VASE_DROPS, 'The ming vase drops with a delicate crash.']
-- OBJ_59:
+- EMERALD:
+    words: ['emera']
     inventory: 'Egg-sized emerald'
     locations: LOC_PLOVER
     treasure: true
     longs:
     - 'There is an emerald here the size of a plover''s egg!'
     - 'There is an emerald resting in a small cavity in the rock!'
-- OBJ_60:
+- PYRAMID:
+    words: ['plati', 'pyram']
     inventory: 'Platinum pyramid'
     locations: LOC_DARKROOM
     treasure: true
     longs:
     - 'There is a platinum pyramid here, 8 inches on a side!'
-- OBJ_61:
+- PEARL:
+    words: ['pearl']
     inventory: 'Glistening pearl'
     locations: LOC_NOWHERE
     treasure: true
     longs:
     - 'Off to one side lies a glistening pearl!'
-- OBJ_62:
+- RUG:
+    words: ['rug', 'persi']
     inventory: 'Persian rug'
     locations: [LOC_SECRET4, LOC_SECRET6]
     immovable: true
@@ -3309,12 +3502,14 @@ object_descriptions: !!omap
     - 'The dragon is sprawled out on a persian rug!!'
     - 'There is a persian rug here, hovering in mid-air!'
 - OBJ_63:
+    words: ['spice']
     inventory: 'Rare spices'
     locations: LOC_BOULDERS2
     treasure: true
     longs:
     - 'There are rare spices here!'
-- OBJ_64:
+- CHAIN:
+    words: ['chain']
     inventory: 'Golden chain'
     locations: LOC_BARRENROOM
     immovable: true
@@ -3323,27 +3518,31 @@ object_descriptions: !!omap
     - 'There is a golden chain lying in a heap on the floor!'
     - 'The bear is locked to the wall with a golden chain!'
     - 'There is a golden chain locked to the wall!'
-- OBJ_65:
+- RUBY:
+    words: ['ruby']
     inventory: 'Giant ruby'
     locations: LOC_STOREROOM
     treasure: true
     longs:
     - 'There is an enormous ruby here!'
     - 'There is a ruby resting in a small cavity in the rock!'
-- OBJ_66:
+- JADE:
+    words: ['jade', 'neckl']
     inventory: 'Jade necklace'
     locations: LOC_NOWHERE
     treasure: true
     longs:
     - 'A precious jade necklace has been dropped here!'
-- OBJ_67:
+- AMBER:
+    words: ['amber', 'gemst']
     inventory: 'Amber gemstone'
     locations: LOC_NOWHERE
     treasure: true
     longs:
     - 'There is a rare amber gemstone here!'
     - 'There is an amber gemstone resting in a small cavity in the rock!'
-- OBJ_68:
+- SAPPH:
+    words: ['sapph']
     inventory: 'Star sapphire'
     locations: LOC_LEDGE
     treasure: true
@@ -3351,6 +3550,7 @@ object_descriptions: !!omap
     - 'A brilliant blue star sapphire is here!'
     - 'There is a star sapphire resting in a small cavity in the rock!'
 - OBJ_69:
+    words: ['ebony', 'statu']
     inventory: 'Ebony statuette'
     locations: LOC_REACHDEAD
     treasure: true