Moved application settings to settings_t struct

[open-adventure.git] / adventure.yaml

diff --git a/adventure.yaml b/adventure.yaml
index 0e8949bcb86107b17e7c0c0773b8b540e41af45f..76107a51b3e5b7b6391790b7fe20de712e1c210e 100644 (file)
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -2805,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?'
@@ -2952,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.'
@@ -3007,7 +3004,7 @@ arbitrary_messages:  !!omap
 - RESUME_HELP: 'To resume your Adventure, start a new game and then say "RESUME".'
 - TABLE_SPACE: 'Table space used:\n%d of %d words of messages   %d of %d travel options\n%d of %d vocabulary words    %d of %d locations\n%d of %d objects             %d of %d action verbs\n%d of %d "random" messages   %d of %d "class" messages\n%d of %d hints               %d of %d turn threshholds'
 - RESUME_ABANDON: 'To resume an earlier Adventure, you must abandon the current one.'
-- VERSION_SKEW: 'I''m sorry, but that Adventure was begun using Version%d.%d of the\nprogram, and this is Version%d.%d.  You must find the other version\nin order to resume that Adventure.'
+- VERSION_SKEW: 'I''m sorry, but that Adventure was begun using Version%d.%d of the\nsave file format, and this program uses Version %d.%d.  You must find an instance\nusing that other version in order to resume that Adventure.'
 # This message is not currently used
 - SAVE_TAMPERING: 'A dark fog creeps in to surround you.  From somewhere in the fog you\nhear a stern voice.  "This Adventure has been tampered with!  You have\nbeen dabbling in magic, knowing not the havoc you might cause thereby.\nLeave at once, before you do irrevocable harm!"  The fog thickens,\nuntil at last you can see nothing at all.  Your vision then clears,\nand you find yourself back in The Real World.'
 - TWIST_TURN: 'Sorry, but the path twisted and turned so much that I can''t figure\nout which way to go to get back.'
@@ -3406,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'