Simplify seed and waste cpmands using %d in the YAML string.

[open-adventure.git] / adventure.yaml

diff --git a/adventure.yaml b/adventure.yaml
index 2d8755e67dce8c4a31b828ab8454afd58f180f2b..6401882f3100aea3b77eb8434180098d1113be21 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -9,10 +9,15 @@
 # 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 true.
-
+#
 # actions: Action words, grouped into synonyms, and their corresponding
 #    default messages. The 'oldstyle' attribute is as for motions.
 #
+# specials: Special action words, grouped into synonyms, and their
+#    messages. These differ from the regular action words above in that
+#    they only display their corresponding message; no other logic is
+#    invoked. In the future, these will be merged into the regular actions.
+#
 # hints: Each item contains a hint number, a hint label (used to
 #    generate the value macro for the hint) the number of turns he
 #    must be at the right loc(s) before triggering the hint, the
@@ -241,9 +246,9 @@ motions: !!omap
     words: ['slab', 'slabr']
 - XYZZY:
     words: ['xyzzy']
-- DPRSSN:
+- DEPRESSION:
     words: ['depre']
-- ENTRNC:
+- ENTRANCE:
     words: ['entra']
 - PLUGH:
     words: ['plugh']
@@ -251,23 +256,21 @@ motions: !!omap
     words: ['secre']
 - CAVE:
     words: ['cave']
-- MOT_68:
-    words: !!null
-- MOT_69:
+- CROSS:
     words: ['cross']
 - BEDQUILT:
     words: ['bedqu']
 - PLOVER:
     words: ['plove']
-- FORWARD2:
+- ORIENTAL:
     words: ['orien']
-- FORWARD3:
+- CAVERN:
     words: ['caver']
-- FORWARD4:
+- SHELLROOM:
     words: ['shell']
-- FORWARD5:
+- RESERVOIR:
     words: ['reser']
-- FORWARD6:
+- OFFICE:
     words: ['main', 'offic']
 
 hints:
@@ -357,7 +360,7 @@ hints:
       question: 'You''re missing only one other treasure.  Do you need help finding it?'
       hint: |-
         Once you've found all the other treasures, it is no longer possible to
-        locate the one you''re now missing.'
+        locate the one you're now missing.
 
 locations: !!omap
 - LOC_NOWHERE:
@@ -3012,6 +3015,8 @@ arbitrary_messages:  !!omap
 - GO_UNNEEDED: |-
     You don't have to say "go" every time; just specify a direction or, if
     it's nearby, name the place to which you wish to move.
+- NUMERIC_REQUIRED:
+    This command requires a numeric argument. 
 
 classes: 
 - threshold: 0
@@ -3224,7 +3229,7 @@ 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
+      I'm afraid the magazine is written in dwarvish.  But pencilled on one
       cover you see, "Please leave the magazines at the construction site."
 - DWARF:
     words: ['dwarf', 'dwarv']
@@ -3738,13 +3743,13 @@ obituaries:
         You are engulfed in a cloud of orange smoke.  Coughing and gasping,
         you emerge from the smoke and find....
   - query: |-
-        You clumsy oaf, you've done it again!  I don''t know how long I can
+        You clumsy oaf, you've done it again!  I don't know how long I can
         keep this up.  Do you want me to try reincarnating you again?
     yes_response: |-
         Okay, now where did I put my orange smoke?....  >POOF!<
         Everything disappears in a dense cloud of orange smoke.
   - query: |-
-        Now you''ve really done it!  I'm out of orange smoke!  You don''t expect
+        Now you've really done it!  I'm out of orange smoke!  You don't expect
         me to do a decent reincarnation without any orange smoke, do you?
     yes_response: 'Okay, if you''re so smart, do it yourself!  I''m leaving!'
 
@@ -3875,6 +3880,12 @@ actions: !!omap
 - PART:
     message: *nothing_happens
     words: ['z''zzz']
+- SEED:
+    message: 'Seed set to %d'
+    words: ['seed']
+- WASTE:
+    message: 'Game limit is now %d'
+    words: ['waste']
 - ACT_UNKNOWN:
     message: *huh_man
     words: !!null