X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=adventure.yaml;h=10c083fb927da8977e220d23a51b69f3cdb68fa4;hb=4b2472fb16d6af6d8513630be8df89c69402ce8b;hp=8265423ed9b5b689d8b9b21f620d7c13c5b53c05;hpb=0bab67e106175e5ccd0a1428c5c37856087ba574;p=open-adventure.git

diff --git a/adventure.yaml b/adventure.yaml
index 8265423..10c083f 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -53,10 +53,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.
 #
@@ -465,11 +465,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:
@@ -477,10 +477,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:
@@ -490,10 +490,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:
@@ -502,11 +502,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:
@@ -515,11 +515,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:
@@ -528,9 +528,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:
@@ -539,11 +539,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:
@@ -553,12 +553,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:
@@ -567,11 +567,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:
@@ -579,9 +579,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:
@@ -589,12 +589,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:
@@ -602,11 +602,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:
@@ -615,11 +615,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:
@@ -627,13 +627,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:
@@ -643,12 +643,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:
@@ -656,7 +656,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_PITTOP]},
+      {verbs: [], action: [goto, LOC_PITTOP]},
     ]
 - LOC_EASTBANK:
     description:
@@ -664,11 +664,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:
@@ -676,7 +676,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:
@@ -685,14 +685,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:
@@ -700,7 +700,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_NOMAKE:
     description:
@@ -708,7 +708,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_DOME:
     description:
@@ -716,7 +716,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_MISTHALL]},
+      {verbs: [], action: [goto, LOC_MISTHALL]},
     ]
 - LOC_WESTEND:
     description:
@@ -724,9 +724,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:
@@ -735,7 +735,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:
@@ -743,9 +743,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:
@@ -753,7 +753,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NARROW]},
+      {verbs: [], action: [goto, LOC_NARROW]},
     ]
 - LOC_WESTBANK:
     description:
@@ -761,12 +761,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:
@@ -774,9 +774,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:
@@ -784,7 +784,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:
@@ -792,8 +792,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:
@@ -801,8 +801,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:
@@ -810,7 +810,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_KINGHALL]},
+      {verbs: [], action: [goto, LOC_KINGHALL]},
     ]
 - LOC_Y2:
     description:
@@ -818,12 +818,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:
@@ -831,8 +831,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:
@@ -840,8 +840,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:
@@ -849,10 +849,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:
@@ -860,8 +860,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:
@@ -870,7 +870,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:
@@ -879,9 +879,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:
@@ -889,7 +889,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_MISTWEST]},
+      {verbs: [], action: [goto, LOC_MISTWEST]},
     ]
 - LOC_MISTWEST:
     description:
@@ -897,10 +897,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:
@@ -909,11 +909,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:
@@ -922,9 +922,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:
@@ -933,10 +933,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:
@@ -945,11 +945,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:
@@ -958,7 +958,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:
@@ -967,7 +967,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:
@@ -976,7 +976,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:
@@ -985,8 +985,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:
@@ -995,10 +995,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:
@@ -1007,10 +1007,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:
@@ -1019,12 +1019,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:
@@ -1033,9 +1033,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:
@@ -1044,7 +1044,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:
@@ -1053,10 +1053,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:
@@ -1065,7 +1065,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:
@@ -1073,11 +1073,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:
@@ -1085,7 +1085,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:
@@ -1093,7 +1093,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_WESTBANK]},
+      {verbs: [], action: [goto, LOC_WESTBANK]},
     ]
 - LOC_LONGEAST:
     description:
@@ -1101,9 +1101,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:
@@ -1111,9 +1111,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:
@@ -1121,10 +1121,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:
@@ -1132,7 +1132,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:
@@ -1142,10 +1142,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:
@@ -1153,18 +1153,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:
@@ -1172,13 +1172,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:
@@ -1186,9 +1186,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:
@@ -1196,9 +1196,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:
@@ -1206,11 +1206,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:
@@ -1218,9 +1218,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:
@@ -1228,9 +1228,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:
@@ -1238,10 +1238,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:
@@ -1249,7 +1249,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:
@@ -1257,10 +1257,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:
@@ -1268,8 +1268,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:
@@ -1277,7 +1277,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['NORTH'], action: ["goto", LOC_WIDEPLACE]},
+      {verbs: ['NORTH'], action: [goto, LOC_WIDEPLACE]},
     ]
 - LOC_TALL:
     description:
@@ -1285,9 +1285,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:
@@ -1295,7 +1295,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SOUTH'], action: ["goto", LOC_TALL]},
+      {verbs: ['SOUTH'], action: [goto, LOC_TALL]},
     ]
 - LOC_SEWER:
     description:
@@ -1303,7 +1303,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_BUILDING]},
+      {verbs: [], action: [goto, LOC_BUILDING]},
     ]
 - LOC_ALIKE11:
     description:
@@ -1312,10 +1312,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:
@@ -1324,7 +1324,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:
@@ -1333,7 +1333,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:
@@ -1341,9 +1341,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:
@@ -1351,9 +1351,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:
@@ -1361,7 +1361,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:
@@ -1370,7 +1370,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:
@@ -1379,7 +1379,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:
@@ -1387,9 +1387,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:
@@ -1397,7 +1397,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_WESTPIT]},
+      {verbs: [], action: [goto, LOC_WESTPIT]},
     ]
 - LOC_PLANTTOP:
     description:
@@ -1405,7 +1405,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_WESTEND]},
+      {verbs: [], action: [goto, LOC_WESTEND]},
     ]
 - LOC_INCLINE:
     description:
@@ -1413,8 +1413,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:
@@ -1422,9 +1422,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:
@@ -1432,7 +1432,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:
@@ -1441,8 +1441,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:
@@ -1452,9 +1452,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:
@@ -1462,7 +1462,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:
@@ -1470,9 +1470,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:
@@ -1481,8 +1481,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:
@@ -1491,9 +1491,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:
@@ -1503,10 +1503,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:
@@ -1515,7 +1515,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:
@@ -1523,7 +1523,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:
@@ -1531,11 +1531,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:
@@ -1543,8 +1543,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:
@@ -1552,8 +1552,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:
@@ -1561,9 +1561,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:
@@ -1571,16 +1571,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:
@@ -1589,8 +1589,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:
@@ -1601,8 +1601,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:
@@ -1610,8 +1610,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:
@@ -1619,10 +1619,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:
@@ -1630,16 +1630,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:
@@ -1648,9 +1648,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:
@@ -1658,7 +1658,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: ['SE'], action: ["goto", LOC_ALIKE13]},
+      {verbs: ['SE'], action: [goto, LOC_ALIKE13]},
     ]
 - LOC_NE:
     description:
@@ -1667,7 +1667,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:
@@ -1676,7 +1676,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:
@@ -1685,11 +1685,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:
@@ -1698,8 +1698,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:
@@ -1707,7 +1707,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:
@@ -1716,8 +1716,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:
@@ -1725,7 +1725,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:
@@ -1734,13 +1734,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:
@@ -1749,10 +1749,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:
@@ -1761,11 +1761,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:
@@ -1774,9 +1774,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:
@@ -1787,10 +1787,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:
@@ -1799,9 +1799,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:
@@ -1809,9 +1809,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:
@@ -1819,10 +1819,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:
@@ -1830,9 +1830,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:
@@ -1840,16 +1840,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:
@@ -1857,16 +1857,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:
@@ -1874,16 +1874,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:
@@ -1891,16 +1891,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:
@@ -1908,16 +1908,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:
@@ -1925,16 +1925,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:
@@ -1942,16 +1942,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:
@@ -1959,16 +1959,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:
@@ -1976,16 +1976,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:
@@ -1993,9 +1993,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:
@@ -2003,8 +2003,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:
@@ -2012,7 +2012,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_DEADEND13]},
+      {verbs: [], action: [goto, LOC_DEADEND13]},
     ]
 - LOC_LARGE:
     description:
@@ -2021,9 +2021,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:
@@ -2031,7 +2031,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:
@@ -2040,10 +2040,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:
@@ -2052,10 +2052,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:
@@ -2064,9 +2064,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:
@@ -2075,8 +2075,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:
@@ -2085,9 +2085,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:
@@ -2096,10 +2096,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:
@@ -2108,10 +2108,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:
@@ -2120,10 +2120,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:
@@ -2132,10 +2132,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:
@@ -2144,10 +2144,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:
@@ -2156,10 +2156,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:
@@ -2168,10 +2168,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:
@@ -2180,10 +2180,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:
@@ -2192,10 +2192,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:
@@ -2204,10 +2204,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:
@@ -2216,9 +2216,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:
@@ -2227,9 +2227,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:
@@ -2238,10 +2238,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:
@@ -2250,10 +2250,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:
@@ -2262,10 +2262,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:
@@ -2274,10 +2274,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:
@@ -2286,10 +2286,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:
@@ -2297,7 +2297,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:
@@ -2307,8 +2307,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:
@@ -2317,9 +2317,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:
@@ -2327,8 +2327,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:
@@ -2336,8 +2336,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:
@@ -2345,8 +2345,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:
@@ -2354,9 +2354,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:
@@ -2364,7 +2364,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_CLIFFTOP:
     description:
@@ -2372,7 +2372,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_CLIFFLEDGE]},
+      {verbs: [], action: [goto, LOC_CLIFFLEDGE]},
     ]
 - LOC_CLIFFLEDGE:
     description:
@@ -2380,8 +2380,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:
@@ -2389,7 +2389,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:
@@ -2397,7 +2397,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_NOWHERE]},
+      {verbs: [], action: [goto, LOC_NOWHERE]},
     ]
 - LOC_FOOF1:
     description:
@@ -2405,7 +2405,7 @@ locations: !!omap
       short: !!null
     conditions: {}
     travel: [
-      {verbs: [], action: ["goto", LOC_DEBRIS]},
+      {verbs: [], action: [goto, LOC_DEBRIS]},
     ]
 - LOC_FOOF2:
     description:
@@ -2413,7 +2413,7 @@ locations: !!omap
       short: !!null
     conditions: {ABOVE: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_BUILDING]},
+      {verbs: [], action: [goto, LOC_BUILDING]},
     ]
 - LOC_FOOF3:
     description:
@@ -2421,7 +2421,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_Y2]},
+      {verbs: [], action: [goto, LOC_Y2]},
     ]
 - LOC_FOOF4:
     description:
@@ -2429,7 +2429,7 @@ locations: !!omap
       short: !!null
     conditions: {ABOVE: true}
     travel: [
-      {verbs: [], action: ["goto", LOC_BUILDING]},
+      {verbs: [], action: [goto, LOC_BUILDING]},
     ]
 - LOC_FOOF5:
     description:
@@ -2437,13 +2437,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
@@ -2771,20 +2774,20 @@ 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]
@@ -2792,25 +2795,25 @@ objects: !!omap
     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]
@@ -2818,7 +2821,7 @@ objects: !!omap
     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
@@ -2833,7 +2836,7 @@ objects: !!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
@@ -2841,13 +2844,13 @@ objects: !!omap
     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
@@ -2857,7 +2860,7 @@ objects: !!omap
     - '' # chased away
     sounds:
     - 'The snake is hissing venomously.'
-- OBJ_12:
+- FISSURE:
     words: ['fissu']
     inventory: '*fissure'
     locations: [LOC_EASTBANK, LOC_WESTBANK]
@@ -2875,7 +2878,7 @@ objects: !!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
@@ -2883,7 +2886,7 @@ objects: !!omap
     - '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
@@ -2893,7 +2896,7 @@ objects: !!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
@@ -2901,24 +2904,24 @@ objects: !!omap
     - '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
@@ -2926,23 +2929,23 @@ objects: !!omap
     - [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
@@ -2958,7 +2961,7 @@ objects: !!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]
@@ -2981,7 +2984,7 @@ objects: !!omap
     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
@@ -3000,7 +3003,7 @@ objects: !!omap
     locations: LOC_NOWHERE
     immovable: true
     longs: !!null # never present
-- OBJ_31:
+- DRAGON:
     words: ['drago']
     inventory: '*dragon'
     locations: [LOC_SECRET4, LOC_SECRET6]
@@ -3014,7 +3017,7 @@ objects: !!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]
@@ -3022,7 +3025,7 @@ objects: !!omap
     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]
@@ -3033,14 +3036,14 @@ objects: !!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
@@ -3050,7 +3053,7 @@ objects: !!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
@@ -3059,13 +3062,13 @@ objects: !!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
@@ -3076,7 +3079,7 @@ objects: !!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
@@ -3089,7 +3092,7 @@ objects: !!omap
     locations: LOC_SOFTROOM
     immovable: true
     longs: !!null
-- OBJ_41:
+- OGRE:
     words: ['ogre']
     inventory: '*ogre'
     locations: LOC_LARGE
@@ -3098,7 +3101,7 @@ objects: !!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
@@ -3107,7 +3110,7 @@ objects: !!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
@@ -3115,14 +3118,14 @@ objects: !!omap
     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]
@@ -3155,7 +3158,7 @@ objects: !!omap
     - ''
     texts:
     - '"You won''t get it up the steps"'
-- OBJ_49:
+- SIGN:
     words: ['sign']
     inventory: '*sign'
     locations: LOC_ANTEROOM
@@ -3166,7 +3169,7 @@ objects: !!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
@@ -3194,21 +3197,21 @@ objects: !!omap
     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
@@ -3217,14 +3220,14 @@ objects: !!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
@@ -3234,7 +3237,7 @@ objects: !!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
@@ -3242,21 +3245,21 @@ objects: !!omap
     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]
@@ -3273,7 +3276,7 @@ objects: !!omap
     treasure: true
     longs:
     - 'There are rare spices here!'
-- OBJ_64:
+- CHAIN:
     words: ['chain']
     inventory: 'Golden chain'
     locations: LOC_BARRENROOM
@@ -3283,7 +3286,7 @@ objects: !!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
@@ -3291,14 +3294,14 @@ objects: !!omap
     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
@@ -3306,7 +3309,7 @@ objects: !!omap
     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