X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=adventure.yaml;h=5cbe9e0dfa49a5d085b9dfda2a2a12c6c4d2b7d0;hp=c35d471a96e3eaec776b7a1d107f93222540ee44;hb=1c4fcaf43edea3d1a29fe6f4949f6397c314c67e;hpb=bf209577a5ec651f24f023cf126340152b65228e

diff --git a/adventure.yaml b/adventure.yaml
index c35d471..5cbe9e0 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -108,18 +108,9 @@
 # Message strings may include certain special character sequences to
 # denote that the program must provide parameters to insert into a
 # message when the message is printed.  These sequences are:
+#       %d = an integer
+#       %s = an ASCII string
 #	%S = The letter 'S' or nothing (if a given value is exactly 1)
-#	%W = A word (up to 10 characters)
-#	%L = A word mapped to lower-case letters
-#	%U = A word mapped to upper-case letters
-#	%C = A word mapped to lower-case, first letter capitalised
-#	%T = Several words of text, ending with a word of -1
-#	%1 = A 1-digit number
-#	%2 = A 2-digit number
-#	...
-#	%9 = A 9-digit number
-#	%B = Variable number of blanks
-#	%! = The entire message should be suppressed
 #	%V = substitute program version string
 
 motions: !!omap
@@ -519,7 +510,7 @@ locations: !!omap
       {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]},
+      {verbs: [DOWN], action: [speak, WHICH_WAY]},
     ]
 - LOC_BUILDING:
     description:
@@ -588,7 +579,7 @@ locations: !!omap
       {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]},
+      {verbs: [SLIT, STREA, DOWN, INWAR, ENTER], action: [speak, DONT_FIT]},
     ]
 - LOC_GRATE:
     description:
@@ -618,7 +609,8 @@ locations: !!omap
       short: 'You''re below the grate.'
     conditions: {LIT: true}
     travel: [
-      {verbs: [OUT, UPWAR], cond: [not, GRATE, GRATE_CLOSED], action: [goto, LOC_GRATE]},
+      {verbs: [OUT, UPWAR], cond: [not, GRATE, GRATE_CLOSED],
+                            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]},
@@ -646,10 +638,10 @@ locations: !!omap
       short: 'You''re in debris room.'
     conditions: {}
     travel: [
-      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED], action: [goto, LOC_GRATE]},
+      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED],
+                       action: [goto, LOC_GRATE]},
       {verbs: [ENTRA], action: [goto, LOC_BELOWGRATE]},
-      {verbs: [CRAWL, COBBL, PASSA, LOW, EAST],
-                                                     action: [goto, LOC_COBBLE]},
+      {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]},
@@ -660,9 +652,10 @@ locations: !!omap
       short: !!null
     conditions: {}
     travel: [
-      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED], action: [goto, LOC_GRATE]},
+      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED],
+                       action: [goto, LOC_GRATE]},
       {verbs: [ENTRA], action: [goto, LOC_BELOWGRATE]},
-      {verbs: [D, EAST, DEBRI], action: [goto, LOC_DEBRIS]},
+      {verbs: [DOWN, EAST, DEBRI], action: [goto, LOC_DEBRIS]},
       {verbs: [INWAR, UPWAR, WEST], action: [goto, LOC_BIRD]},
       {verbs: [PIT], action: [goto, LOC_PITTOP]},
     ]
@@ -676,7 +669,8 @@ locations: !!omap
     conditions: {}
     hints: [*bird] 
     travel: [
-      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED], action: [goto, LOC_GRATE]},
+      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED],
+                       action: [goto, LOC_GRATE]},
       {verbs: [ENTRA], action: [goto, LOC_BELOWGRATE]},
       {verbs: [DEBRI], action: [goto, LOC_DEBRIS]},
       {verbs: [CANYO, EAST], action: [goto, LOC_AWKWARD]},
@@ -690,13 +684,14 @@ locations: !!omap
       short: 'You''re at top of small pit.'
     conditions: {}
     travel: [
-      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED], action: [goto, LOC_GRATE]},
+      {verbs: [DEPRE], cond: [not, GRATE, GRATE_CLOSED],
+                       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],
+      {verbs: [DOWN, PIT, STEPS], cond: [carry, NUGGET],
                                action: [goto, LOC_NECKBROKE]},
-      {verbs: [D], action: [goto, LOC_MISTHALL]},
+      {verbs: [DOWN], action: [goto, LOC_MISTHALL]},
       {verbs: [CRACK, WEST], action: [goto, LOC_CRACK]},
     ]
 - LOC_MISTHALL:
@@ -714,7 +709,7 @@ locations: !!omap
     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: [STAIR, DOWN, 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]},
@@ -813,7 +808,7 @@ locations: !!omap
     travel: [
       {verbs: [EAST, ACROS], action: [goto, LOC_EASTEND]},
       {verbs: [WEST, SLAB], action: [goto, LOC_SLAB]},
-      {verbs: [D, PIT], action: [goto, LOC_WESTPIT]},
+      {verbs: [DOWN, PIT], action: [goto, LOC_WESTPIT]},
       {verbs: [HOLE], action: [speak, TOO_FAR]},
     ]
 - LOC_EASTPIT:
@@ -835,7 +830,8 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [UPWAR, OUT], action: [goto, LOC_WESTEND]},
-      {verbs: [CLIMB], cond: [not, PLANT, 2], action: [goto, LOC_BUILDING1]},
+      {verbs: [CLIMB], cond: [not, PLANT, PLANT_GROWN],
+                       action: [goto, LOC_BUILDING1]},
       {verbs: [CLIMB], action: [goto, LOC_CLIMBSTALK]},
     ]
 - LOC_CLIMBSTALK:
@@ -873,7 +869,7 @@ locations: !!omap
     travel: [
       {verbs: [HALL, OUT, SOUTH], action: [goto, LOC_KINGHALL]},
       {verbs: [NORTH, Y2], action: [goto, LOC_Y2]},
-      {verbs: [D, HOLE], action: [goto, LOC_BROKEN]},
+      {verbs: [DOWN, HOLE], action: [goto, LOC_BROKEN]},
     ]
 - LOC_SOUTHSIDE:
     description:
@@ -900,7 +896,8 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [], cond: [not, PLANT, 1], action: [goto, LOC_NOCLIMB]},
+      {verbs: [], cond: [not, PLANT, PLANT_BELLOWING],
+                  action: [goto, LOC_NOCLIMB]},
       {verbs: [], action: [goto, LOC_PLANTTOP]},
     ]
 - LOC_SNAKEBLOCK:
@@ -933,7 +930,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D, Y2], action: [goto, LOC_Y2]},
+      {verbs: [DOWN, Y2], action: [goto, LOC_Y2]},
       {verbs: [UPWAR], action: [goto, LOC_MISTHALL]},
     ]
 - LOC_WINDOW1:
@@ -974,7 +971,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [WEST, CRAWL], action: [goto, LOC_BROKEN]},
-      {verbs: [D, PIT, CLIMB], action: [goto, LOC_SMALLPIT]},
+      {verbs: [DOWN, PIT, CLIMB], action: [goto, LOC_SMALLPIT]},
     ]
 - LOC_SMALLPIT:
     description:
@@ -986,7 +983,7 @@ locations: !!omap
     sound: STREAM_GURGLES
     travel: [
       {verbs: [CLIMB, UPWAR, OUT], action: [goto, LOC_SMALLPITBRINK]},
-      {verbs: [SLIT, STREA, D, UPSTR, DOWNS, ENTER, INWAR],
+      {verbs: [SLIT, STREA, DOWN, UPSTR, DOWNS, ENTER, INWAR],
                                    action: [speak, DONT_FIT]},
     ]
 - LOC_DUSTY:
@@ -998,7 +995,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [EAST, PASSA], action: [goto, LOC_BROKEN]},
-      {verbs: [D, HOLE, FLOOR], action: [goto, LOC_COMPLEX]},
+      {verbs: [DOWN, HOLE, FLOOR], action: [goto, LOC_COMPLEX]},
       {verbs: [BEDQU], action: [goto, LOC_BEDQUILT]},
     ]
 - LOC_PARALLEL1:
@@ -1057,7 +1054,7 @@ locations: !!omap
     hints: [*maze]
     travel: [
       {verbs: [EAST], action: [goto, LOC_ALIKE2]},
-      {verbs: [D], action: [goto, LOC_DEADEND3]},
+      {verbs: [DOWN], action: [goto, LOC_DEADEND3]},
       {verbs: [SOUTH], action: [goto, LOC_ALIKE6]},
       {verbs: [NORTH], action: [goto, LOC_DEADEND9]},
     ]
@@ -1120,7 +1117,7 @@ locations: !!omap
     travel: [
       {verbs: [EAST], action: [goto, LOC_ALIKE3]},
       {verbs: [WEST], action: [goto, LOC_ALIKE5]},
-      {verbs: [D], action: [goto, LOC_ALIKE7]},
+      {verbs: [DOWN], action: [goto, LOC_ALIKE7]},
       {verbs: [SOUTH], action: [goto, LOC_ALIKE8]},
     ]
 - LOC_ALIKE7:
@@ -1147,7 +1144,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DEADEND11]},
     ]
 - LOC_ALIKE9:
     description:
@@ -1178,7 +1175,7 @@ locations: !!omap
     travel: [
       {verbs: [WEST], action: [goto, LOC_ALIKE8]},
       {verbs: [NORTH], action: [goto, LOC_ALIKE10]},
-      {verbs: [D], action: [goto, LOC_DEADEND5]},
+      {verbs: [DOWN], action: [goto, LOC_DEADEND5]},
       {verbs: [EAST], action: [goto, LOC_PITBRINK]},
     ]
 - LOC_DEADEND5:
@@ -1199,7 +1196,7 @@ locations: !!omap
       short: 'You''re at brink of pit.'
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: [D, CLIMB], action: [goto, LOC_BIRD]},
+      {verbs: [DOWN, CLIMB], action: [goto, LOC_BIRD]},
       {verbs: [WEST], action: [goto, LOC_ALIKE10]},
       {verbs: [SOUTH], action: [goto, LOC_DEADEND6]},
       {verbs: [NORTH], action: [goto, LOC_ALIKE12]},
@@ -1234,7 +1231,7 @@ locations: !!omap
     travel: [
       {verbs: [EAST, UPWAR, CRAWL], action: [goto, LOC_MISTWEST]},
       {verbs: [WEST], action: [goto, LOC_LONGWEST]},
-      {verbs: [NORTH, D, HOLE], action: [goto, LOC_CROSSOVER]},
+      {verbs: [NORTH, DOWN, HOLE], action: [goto, LOC_CROSSOVER]},
     ]
 - LOC_LONGWEST:
     description:
@@ -1301,8 +1298,8 @@ locations: !!omap
       {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: [DOWN], cond: [pct, 65], action: [speak, FUTILE_CRAWL]},
+      {verbs: [DOWN], action: [goto, LOC_ANTEROOM]},
     ]
 - LOC_SWISSCHEESE:
     description:
@@ -1334,7 +1331,7 @@ locations: !!omap
     travel: [
       {verbs: [EAST], action: [goto, LOC_SWISSCHEESE]},
       {verbs: [WEST, ACROS], action: [goto, LOC_WESTEND]},
-      {verbs: [D, PIT], action: [goto, LOC_EASTPIT]},
+      {verbs: [DOWN, PIT], action: [goto, LOC_EASTPIT]},
     ]
 - LOC_SLAB:
     description:
@@ -1357,7 +1354,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D, SLAB], action: [goto, LOC_SLAB]},
+      {verbs: [DOWN, SLAB], action: [goto, LOC_SLAB]},
       {verbs: [SOUTH], cond: [not, DRAGON, DRAGON_BARS],
                          action: [goto, LOC_SECRET5]},
       {verbs: [SOUTH], action: [goto, LOC_SECRET4]},
@@ -1371,7 +1368,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [NORTH], action: [goto, LOC_THREEJUNCTION]},
-      {verbs: [D, PASSA], action: [goto, LOC_BEDQUILT]},
+      {verbs: [DOWN, PASSA], action: [goto, LOC_BEDQUILT]},
       {verbs: [SOUTH], action: [goto, LOC_TOPSTALACTITE]},
     ]
 - LOC_THREEJUNCTION:
@@ -1418,7 +1415,7 @@ locations: !!omap
       {verbs: [EAST], action: [goto, LOC_KINGHALL]},
       {verbs: [WEST], cond: [not, DRAGON, DRAGON_BARS], action: [goto, LOC_SECRET5]},
       {verbs: [WEST], action: [goto, LOC_SECRET6]},
-      {verbs: [D], action: [goto, LOC_WIDEPLACE]},
+      {verbs: [DOWN], action: [goto, LOC_WIDEPLACE]},
     ]
 - LOC_WIDEPLACE:
     description:
@@ -1552,7 +1549,7 @@ locations: !!omap
       short: 'You''re in narrow corridor.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D, CLIMB, EAST], action: [goto, LOC_WESTPIT]},
+      {verbs: [DOWN, CLIMB, EAST], action: [goto, LOC_WESTPIT]},
       {verbs: [JUMP], action: [goto, LOC_NECKBROKE]},
       {verbs: [WEST, GIANT], action: [goto, LOC_GIANTROOM]},
     ]
@@ -1582,7 +1579,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [NORTH, CAVER, PASSA], action: [goto, LOC_WATERFALL]},
-      {verbs: [D, CLIMB], action: [goto, LOC_LOWROOM]},
+      {verbs: [DOWN, CLIMB], action: [goto, LOC_LOWROOM]},
     ]
 - LOC_GIANTROOM:
     description:
@@ -1714,7 +1711,7 @@ locations: !!omap
       short: 'You''re in arched hall.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D, SHELL, OUT], action: [goto, LOC_SHELLROOM]},
+      {verbs: [DOWN, SHELL, OUT], action: [goto, LOC_SHELLROOM]},
     ]
 - LOC_SHELLROOM:
     description:
@@ -1727,7 +1724,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [UPWAR, HALL], action: [goto, LOC_ARCHED]},
-      {verbs: [D], action: [goto, LOC_SLOPING1]},
+      {verbs: [DOWN], action: [goto, LOC_SLOPING1]},
       {verbs: [SOUTH], cond: [carry, CLAM],
                          action: [speak, CLAM_BLOCKER]},
       {verbs: [SOUTH], cond: [carry, OYSTER],
@@ -1741,7 +1738,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [UPWAR, SHELL], action: [goto, LOC_SHELLROOM]},
-      {verbs: [D], action: [goto, LOC_CULDESAC]},
+      {verbs: [DOWN], action: [goto, LOC_CULDESAC]},
     ]
 - LOC_CULDESAC:
     description:
@@ -1781,7 +1778,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_LONGWEST]},
     ]
 - LOC_WITTSEND:
     description:
@@ -1839,10 +1836,10 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [NORTH], action: [goto, LOC_SECRET2]},
-      {verbs: [D, JUMP, CLIMB], cond: [pct, 40],
+      {verbs: [DOWN, 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: [DOWN], cond: [pct, 50], action: [goto, LOC_ALIKE9]},
+      {verbs: [DOWN], action: [goto, LOC_ALIKE4]},
     ]
 - LOC_DIFFERENT2:
     description:
@@ -1857,7 +1854,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT10]},
       {verbs: [UPWAR], action: [goto, LOC_DIFFERENT11]},
       {verbs: [SOUTH], action: [goto, LOC_DEADEND13]},
     ]
@@ -1874,7 +1871,7 @@ locations: !!omap
     sound: STREAM_SPLASHES
     travel: [
       {verbs: [SOUTH, OUT], action: [goto, LOC_MIRRORCANYON]},
-      {verbs: [NORTH, ACROS, CROSS], cond: [not, RESER, 1], action: [speak, BAD_DIRECTION]},
+      {verbs: [NORTH, ACROS, CROSS], cond: [not, RESER, WATERS_PARTED], action: [speak, BAD_DIRECTION]},
       {verbs: [NORTH], action: [goto, LOC_RESBOTTOM]},
     ]
 - LOC_DEADEND12:
@@ -1921,7 +1918,7 @@ locations: !!omap
     sound: SNAKES_HISSING
     travel: [
       {verbs: [NE], action: [goto, LOC_NE]},
-      {verbs: [D], action: [speak, GRATE_NOWAY]},
+      {verbs: [DOWN], action: [speak, GRATE_NOWAY]},
     ]
 - LOC_SWCHASM:
     description:
@@ -1950,7 +1947,7 @@ locations: !!omap
       short: 'You''re in sloping corridor.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D], action: [goto, LOC_LOWROOM]},
+      {verbs: [DOWN], action: [goto, LOC_LOWROOM]},
       {verbs: [UPWAR], action: [goto, LOC_SWCHASM]},
     ]
 - LOC_SECRET4:
@@ -2070,7 +2067,7 @@ locations: !!omap
     travel: [
       {verbs: [SOUTH, PASSA, OUT], action: [goto, LOC_WARMWALLS]},
       {verbs: [FORK], action: [goto, LOC_FORK]},
-      {verbs: [D], action: [speak, RIDICULOUS_ATTEMPT]},
+      {verbs: [DOWN], action: [speak, RIDICULOUS_ATTEMPT]},
       {verbs: [JUMP], action: [goto, LOC_GRUESOME]},
     ]
 - LOC_BOULDERS2:
@@ -2097,7 +2094,7 @@ locations: !!omap
     conditions: {NOARRR: true, DEEP: true}
     travel: [
       {verbs: [NORTH, UPWAR, FORK], action: [goto, LOC_FORK]},
-      {verbs: [SOUTH, D, BARRE], action: [goto, LOC_BARRENFRONT]},
+      {verbs: [SOUTH, DOWN, BARRE], action: [goto, LOC_BARRENFRONT]},
       {verbs: [VIEW], action: [goto, LOC_BREATHTAKING]},
     ]
 - LOC_BARRENFRONT:
@@ -2138,7 +2135,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT9]},
       {verbs: [NORTH], action: [goto, LOC_DIFFERENT10]},
       {verbs: [SOUTH], action: [goto, LOC_DIFFERENT11]},
       {verbs: [EAST], action: [goto, LOC_DIFFERENT2]},
@@ -2157,7 +2154,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT11]},
       {verbs: [SE], action: [goto, LOC_DIFFERENT2]},
     ]
 - LOC_DIFFERENT5:
@@ -2167,7 +2164,7 @@ locations: !!omap
     conditions: {DEEP: true, NOBACK: true}
     travel: [
       {verbs: [UPWAR], action: [goto, LOC_DIFFERENT1]},
-      {verbs: [D], action: [goto, LOC_DIFFERENT3]},
+      {verbs: [DOWN], action: [goto, LOC_DIFFERENT3]},
       {verbs: [WEST], action: [goto, LOC_DIFFERENT4]},
       {verbs: [NE], action: [goto, LOC_DIFFERENT6]},
       {verbs: [SW], action: [goto, LOC_DIFFERENT7]},
@@ -2188,7 +2185,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT8]},
       {verbs: [SOUTH], action: [goto, LOC_DIFFERENT9]},
       {verbs: [UPWAR], action: [goto, LOC_DIFFERENT10]},
       {verbs: [WEST], action: [goto, LOC_DIFFERENT11]},
@@ -2202,7 +2199,7 @@ locations: !!omap
     travel: [
       {verbs: [NORTH], action: [goto, LOC_DIFFERENT1]},
       {verbs: [SE], action: [goto, LOC_DIFFERENT3]},
-      {verbs: [D], action: [goto, LOC_DIFFERENT4]},
+      {verbs: [DOWN], action: [goto, LOC_DIFFERENT4]},
       {verbs: [SOUTH], action: [goto, LOC_DIFFERENT5]},
       {verbs: [EAST], action: [goto, LOC_DIFFERENT6]},
       {verbs: [WEST], action: [goto, LOC_DIFFERENT8]},
@@ -2221,7 +2218,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT6]},
       {verbs: [SOUTH], action: [goto, LOC_DIFFERENT7]},
       {verbs: [NW], action: [goto, LOC_DIFFERENT9]},
       {verbs: [SE], action: [goto, LOC_DIFFERENT10]},
@@ -2237,7 +2234,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT5]},
       {verbs: [UPWAR], action: [goto, LOC_DIFFERENT6]},
       {verbs: [NW], action: [goto, LOC_DIFFERENT7]},
       {verbs: [NORTH], action: [goto, LOC_DIFFERENT8]},
@@ -2251,7 +2248,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true, NOBACK: true}
     travel: [
-      {verbs: [D], action: [goto, LOC_DIFFERENT1]},
+      {verbs: [DOWN], action: [goto, LOC_DIFFERENT1]},
       {verbs: [EAST], action: [goto, LOC_DIFFERENT3]},
       {verbs: [NE], action: [goto, LOC_DIFFERENT4]},
       {verbs: [UPWAR], action: [goto, LOC_DIFFERENT5]},
@@ -2273,7 +2270,7 @@ locations: !!omap
       {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: [DOWN], action: [goto, LOC_DIFFERENT7]},
       {verbs: [SE], action: [goto, LOC_DIFFERENT8]},
       {verbs: [UPWAR], action: [goto, LOC_DIFFERENT9]},
       {verbs: [SOUTH], action: [goto, LOC_DIFFERENT10]},
@@ -2629,7 +2626,7 @@ locations: !!omap
     conditions: {DEEP: true}
     travel: [
       {verbs: [UPWAR, NW], action: [goto, LOC_STEEP]},
-      {verbs: [D, SE], action: [goto, LOC_RESNORTH]},
+      {verbs: [DOWN, SE], action: [goto, LOC_RESNORTH]},
     ]
 - LOC_STEEP:
     description:
@@ -2637,7 +2634,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D, SE], action: [goto, LOC_TREACHEROUS]},
+      {verbs: [DOWN, SE], action: [goto, LOC_TREACHEROUS]},
       {verbs: [UPWAR, NW], action: [goto, LOC_CLIFFBASE]},
     ]
 - LOC_CLIFFBASE:
@@ -2650,7 +2647,7 @@ locations: !!omap
       short: 'You''re at base of cliff.'
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D, SE], action: [goto, LOC_STEEP]},
+      {verbs: [DOWN, SE], action: [goto, LOC_STEEP]},
       {verbs: [UPWAR, CLIMB], action: [goto, LOC_CLIFFACE]},
     ]
 - LOC_CLIFFACE:
@@ -2659,7 +2656,7 @@ locations: !!omap
       short: !!null
     conditions: {DEEP: true}
     travel: [
-      {verbs: [D], action: [goto, LOC_CLIFFBASE]},
+      {verbs: [DOWN], action: [goto, LOC_CLIFFBASE]},
       {verbs: [UPWAR], cond: [carry, OBJ_46], action: [goto, LOC_CLIFFTOP]},
       {verbs: [UPWAR], action: [goto, LOC_FOOTSLIP]},
     ]
@@ -3110,9 +3107,9 @@ arbitrary_messages:  !!omap
 - ONE_HIT: 'One of them gets you!'
 - NONE_HIT: 'None of them hits you!'
 - DONT_KNOW: 'Sorry, I don''t know the word "%s".'
-- WHAT_DO: 'What do you want to do with the %L%L?' # FIXME: %L%L should become %L once parsing no longer depends on packed tokens
-- NO_SEE: 'I see no %L%L here.' # FIXME: %L%L should become %L once parsing no longer depends on packed tokens
-- DO_WHAT: '%C what?'
+- WHAT_DO: 'What do you want to do with the %s?'
+- NO_SEE: 'I see no %s here.'
+- DO_WHAT: '%s what?'
 - OKEY_DOKEY: 'Okay, "%s".'
 - GARNERED_POINTS: 'You have garnered %d out of a possible %d points, using %d turn%S.'
 - SUSPEND_WARNING: |-
@@ -3405,10 +3402,8 @@ objects: !!omap
     immovable: true
     descriptions:
     - 'There is a tiny little plant in the pit, murmuring "water, water, ..."'
-    - |-
-      There is a 12-foot-tall beanstalk stretching up out of the pit,
-      bellowing "WATER!! WATER!!"
-    - 'There is a gigantic beanstalk stretching all the way up to the hole.'
+    - [PLANT_BELLOWING, 'There is a 12-foot-tall beanstalk stretching up out of the pit,\nbellowing "WATER!! WATER!!"']
+    - [PLANT_GROWN, 'There is a gigantic beanstalk stretching all the way up to the hole.']
     - 'The plant spurts into furious growth for a few seconds.'
     - 'The plant grows explosively, almost filling the bottom of the pit.'
     - 'You''ve over-watered the plant!  It''s shriveling up!  And now . . .'