Forther break apart the magic enconding of travel arrays.

[open-adventure.git] / adventure.yaml

diff --git a/adventure.yaml b/adventure.yaml
index 943b78f204ade66a218e393afec99c93089abda3..5a66e1959aed92170691c6a595099cd15d96714a 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -6,17 +6,12 @@
 #
 # We define a bunch of YAML structures:
 #
-# vocabulary: - This structure is unused, and will eventually be removed. -
-#    Almost all the words the game knows - one of them (the
-#    reservoir magic word) gets replaced with a randomly-generated
-#    cookie.  For each word there is a type (motion, action, object,
-#    or special) and a numeric value.  Multiple synonyms may have the
-#    same value.
-#
-# motions: Motion words, grouped into synonyms.
-#
+# motions: Motion words, grouped into synonyms.  The 'oldstyle'
+#    attribute, if false, means that single-letter synonyms should be
+#    accepted in oldstyle mode; it defaults to truie.
+
 # actions: Action words, grouped into synonyms, and their corresponding
-#    default messages.
+#    default messages. The 'oldstyle' attribute is as for motions.
 #
 # hints: Each item contains a hint number, a hint label (used to
 #    generate the value macro for the hint) the number of turns he
@@ -243,6 +238,7 @@ motions: !!omap
     words: ['climb']
 - LOOK:
     words: ['l', 'x', 'look', 'exami', 'touch', 'descr']
+    oldstyle: false
 - MOT_58:
     words: ['floor']
 - MOT_59:
@@ -290,6 +286,7 @@ actions: !!omap
     message: ALREADY_CARRYING
     words: ['g', 'carry', 'take', 'keep', 'catch',
             'steal', 'captu', 'get', 'tote', 'snarf']
+    oldstyle: false
 - DROP:
     message: ARENT_CARRYING
     words: ['drop', 'relea', 'free', 'disca', 'dump']
@@ -302,6 +299,7 @@ actions: !!omap
 - NOTHING:
     message: NO_MESSAGE
     words: ['z', 'nothi']
+    oldstyle: false
 - LOCK:
     message: NOT_LOCKABLE
     words: ['lock', 'close']
@@ -348,6 +346,7 @@ actions: !!omap
 - INVENTORY:
     message: NEARBY
     words: ['i', 'inven']
+    oldstyle: false
 - FEED:
     message: NO_EDIBLES
     words: ['feed']
@@ -3081,7 +3080,6 @@ arbitrary_messages:  !!omap
 - DONT_UNDERSTAND: 'I''m afraid I don''t understand.'
 - HAND_PASSTHROUGH: 'Your hand passes through it as though it weren''t there.'
 - BREAK_MIRROR: 'You strike the mirror a resounding blow, whereupon it shatters into a\nmyriad tiny fragments.'
-- BREAK_VASE: 'You have taken the vase and hurled it delicately to the ground.'
 - PROD_DWARF: 'You prod the nearest dwarf, who wakes up grumpily, takes one look at\nyou, curses, and grabs for his axe.'
 - THIS_ACCEPTABLE: 'Is this acceptable?'
 # This message is not currently used
@@ -3678,6 +3676,10 @@ 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.']
+    changes:
+    - ''
+    - ''
+    - 'You have taken the vase and hurled it delicately to the ground.'
 - EMERALD:
     words: ['emera']
     inventory: 'Egg-sized emerald'
@@ -3724,9 +3726,9 @@ objects: !!omap
     immovable: true
     treasure: true
     descriptions:
-    - '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!'
+    - [CHAIN_HEAP, 'There is a golden chain lying in a heap on the floor!']
+    - [CHAINING_BEAR, 'The bear is locked to the wall with a golden chain!']
+    - [CHAIN_FIXED, 'There is a golden chain locked to the wall!']
 - RUBY:
     words: ['ruby']
     inventory: 'Giant ruby'