X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=adventure.yaml;h=35560f16550294f6059652f20e2878aae49454bd;hb=ea963d4af8ae1e591ee988b86978ea5b748ded84;hp=a30a369e7714202136aa04d82475149a60712334;hpb=e05f959974ec2802362d25b8305a26e58d14a753;p=open-adventure.git

diff --git a/adventure.yaml b/adventure.yaml
index a30a369..35560f1 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -8,7 +8,7 @@
 #
 # 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.
+#    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.
@@ -56,6 +56,7 @@
 #                      [with, OBJ]    Must be carrying or in room with
 #                      [not, OBJ N]   Property of named OBJ must not be N.
 #                                     N may be numeric or a state label.
+#                      [nodwarves]    Dwarves must skip this rule.
 #    All attributes are optional except the long description and
 #    travel. Order of locations is not significant.
 #
@@ -1244,7 +1245,7 @@ locations: !!omap
     travel: [
       {verbs: ['EAST'], action: [goto, LOC_LONGEAST]},
       {verbs: ['NORTH'], action: [goto, LOC_CROSSOVER]},
-      {verbs: ['SOUTH'], cond: [carry, OBJ_0], action: [goto, LOC_DIFFERENT1]},
+      {verbs: ['SOUTH'], cond: ["nodwarves"], action: [goto, LOC_DIFFERENT1]},
     ]
 - LOC_CROSSOVER:
     description:
@@ -2804,7 +2805,6 @@ arbitrary_messages:  !!omap
 - NOT_LOCKABLE: 'I don''t know how to lock or unlock such a thing.'
 - ALREADY_LOCKED: 'It was already locked.'
 - ALREADY_UNLOCKED: 'It was already unlocked.'
-- URN_EMPTY: 'The urn is empty and will not light.'
 - BEAR_BLOCKS: 'There is no way to get past the bear to unlock the chain, which is\nprobably just as well.'
 - NOTHING_HAPPENS: 'Nothing happens.'
 - WHERE_QUERY: 'Where?'
@@ -2864,8 +2864,6 @@ arbitrary_messages:  !!omap
 - RIDICULOUS_ATTEMPT: 'Don''t be ridiculous!'
 - RUSTY_DOOR: 'The door is extremely rusty and refuses to open.'
 - SHAKING_LEAVES: 'The plant indignantly shakes the oil off its leaves and asks, "Water?"'
-- RUSTED_HINGES: 'The hinges are quite thoroughly rusted now and won''t budge.'
-- OILED_NINGES: 'The oil has freed up the hinges so that the door will now move,\nalthough it requires some effort.'
 - DEEP_ROOTS: 'The plant has exceptionally deep roots and cannot be pulled free.'
 - KNIVES_VANISH: 'The dwarves'' knives vanish as they strike the walls of the cave.'
 - MUST_DROP: 'Something you''re carrying won''t fit through the tunnel with you.\nYou''d best take inventory and drop something.'
@@ -2953,8 +2951,6 @@ arbitrary_messages:  !!omap
 - FREE_FLY: 'The bird flies about agitatedly for a moment.'
 - CAGE_FLY: 'The bird flies agitatedly about the cage.'
 - NECKLACE_FLY: 'The bird flies about agitatedly for a moment, then disappears through\nthe crack.  It reappears shortly, carrying in its beak a jade\nnecklace, which it drops at your feet.'
-- URN_LIT: 'The urn is now lit.'
-- URN_DARK: 'The urn is now dark.'
 - WATER_URN: 'You empty the bottle into the urn, which promptly ejects the water\nwith uncanny accuracy, squirting you directly between the eyes.'
 - OIL_URN: 'Your bottle is now empty and the urn is full of oil.'
 - FULL_URN: 'The urn is already full of oil.'
@@ -3130,8 +3126,11 @@ objects: !!omap
     locations: LOC_IMMENSE
     immovable: true
     descriptions:
-    - 'The way north is barred by a massive, rusty, iron door.'
-    - 'The way north leads through a massive, rusty, iron door.'
+    - [DOOR_RUSTED, 'The way north is barred by a massive, rusty, iron door.']
+    - [DOOR_UNRUSTED, 'The way north leads through a massive, rusty, iron door.']
+    changes:
+    - 'The hinges are quite thoroughly rusted now and won''t budge.'
+    - 'The oil has freed up the hinges so that the door will now move,\nalthough it requires some effort.'
 - PILLOW:
     words: ['pillo', 'velve']
     inventory: 'Velvet pillow'
@@ -3329,6 +3328,7 @@ objects: !!omap
     - [TROLL_GONE, ''] # chased away
     sounds:
     - 'The troll sounds quite adamant in his demand for a treasure.'
+    - 'The troll sounds quite adamant in his demand for a treasure.'
 - TROLL2:
     words: ['troll']
     inventory: '*phony troll'
@@ -3403,9 +3403,13 @@ objects: !!omap
     locations: LOC_CLIFF
     immovable: true
     descriptions:
-    - '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.'
+    - [URN_EMPTY, 'A small urn is embedded in the rock.']
+    - [URN_DARK, 'A small urn full of oil is embedded in the rock.']
+    - [URN_LIT, 'A small oil flame extrudes from an urn embedded in the rock.']
+    changes:
+    - 'The urn is empty and will not light.'
+    - 'The urn is now dark.'
+    - 'The urn is now lit.'
 - CAVITY:
     words: ['cavit']
     inventory: '*cavity'
@@ -3513,9 +3517,9 @@ objects: !!omap
     locations: LOC_GIANTROOM
     treasure: true
     descriptions:
-    - 'There is a large nest here, full of golden eggs!'
-    - 'The nest of golden eggs has vanished!'
-    - 'Done!'
+    - [EGGS_HERE, 'There is a large nest here, full of golden eggs!']
+    - [EGGS_VANISHED, 'The nest of golden eggs has vanished!']
+    - [EGGS_DONE, 'Done!']
 - TRIDENT:
     words: ['tride']
     inventory: 'Jeweled trident'