X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=adventure.yaml;h=4486b0eeb9a2d5b5de894191f69fc6186153f410;hb=4f042d0ca42b14c3db96956bcc6d9a6e5c35b488;hp=8d9de05d277f24b1032d1867924c0b5dcfdf8a2d;hpb=bba2af13d5b00fd2350f3de0935d301c0ffa278c;p=open-adventure.git

diff --git a/adventure.yaml b/adventure.yaml
index 8d9de05..4486b0e 100644
--- a/adventure.yaml
+++ b/adventure.yaml
@@ -1,5 +1,5 @@
 locations: !!omap
-- LOC_0:
+- LOC_NOWHERE:
     description:
       long: !!null
       short: !!null
@@ -804,7 +804,7 @@ arbitrary_messages:  !!omap
 - FUTILE_CRAWL: 'You have crawled around in some little holes and wound up back in the\nmain passage.'
 - FOLLOW_STREAM: 'I don''t know where the cave is, but hereabouts no stream can run on\nthe surface for long.  I would try the stream.'
 - NEED_DETAIL: 'I need more detailed instructions to do that.'
-- NEreplace: 'I can only tell you what you see as you move about and manipulate\nthings.  I cannot tell you where remote things are.'
+- NEARBY: 'I can only tell you what you see as you move about and manipulate\nthings.  I cannot tell you where remote things are.'
 - OGRE_SNARL: 'The ogre snarls and shoves you back.'
 - HUH_MAN: 'Huh?'
 - ENTRY_QUERY: 'Are you trying to get into the cave?'
@@ -826,16 +826,16 @@ arbitrary_messages:  !!omap
 - CANT_POUR: 'You can''t pour that.'
 - WATCH_IT: 'Watch it!'
 - WHICH_WAY: 'Which way?'
-- REINCARNATE_QUERY: 'Oh dear, you seem to have gotten yourself killed.  I might be able to\nhelp you out, but I''ve never really done this before.  Do you want me\nto try to reincarnate you?'
-- DONT_BLAME: 'All right.  But don''t blame me if something goes wr......\n                    --- POOF!! ---\nYou are engulfed in a cloud of orange smoke.  Coughing and gasping,\nyou emerge from the smoke and find....'
-- CLUMSY_OAF: 'You clumsy oaf, you''ve done it again!  I don''t know how long I can\nkeep this up.  Do you want me to try reincarnating you again?'
-- ORANGE_SMOKE: 'Okay, now where did I put my orange smoke?....  >POOF!<\nEverything disappears in a dense cloud of orange smoke.'
-- SMOKE_OUT: 'Now you''ve really done it!  I''m out of orange smoke!  You don''t expect\nme to do a decent reincarnation without any orange smoke, do you?'
-- DOIT_YOURSELF: 'Okay, if you''re so smart, do it yourself!  I''m leaving!'
-- GETS_YOU7: !!null
-- GETS_YOU8: !!null
-- GETS_YOU9: !!null
-- MISSES_YOU0: '>>> messages 81 thru 90 are reserved for "obituaries". <<<'
+- ARB_81: !!null
+- ARB_82: !!null
+- ARB_83: !!null
+- ARB_84: !!null
+- ARB_85: !!null
+- ARB_86: !!null
+- ARB_87: !!null
+- ARB_88: !!null
+- ARB_89: !!null
+- ARB_90: !!null
 - FORGOT_PATH: 'Sorry, but I no longer seem to remember how it was you got here.'
 - CARRY_LIMIT: 'You can''t carry anything more.  You''ll have to drop something first.'
 - GRATE_NOWAY: 'You can''t go through a locked steel grate!'
@@ -883,7 +883,7 @@ arbitrary_messages:  !!omap
 - SPLATTER_MESSAGE: 'There is a loud explosion, and you are suddenly splashed across the\nwalls of the room.'
 - DWARVES_AWAKEN: 'The resulting ruckus has awakened the dwarves.  There are now several\nthreatening little dwarves in the room with you!  Most of them throw\nknives at you!  All of them get you!'
 - UNHAPPY_BIRD: 'Oh, leave the poor unhappy bird alone.'
-- NEEDED_NEreplace: 'I daresay whatever you want is around here somewhere.'
+- NEEDED_NEARBY: 'I daresay whatever you want is around here somewhere.'
 - STOP_UNKNOWN: 'I don''t know the word "stop".  Use "quit" if you want to give up.'
 - NOT_CONNECTED: 'You can''t get there from here.'
 - TAME_BEAR: 'You are being followed by a very large, tame bear.'
@@ -1152,14 +1152,13 @@ object_descriptions: !!omap
     - 'There is a bottle of oil here.'
 - OBJ_21:
     inventory: 'Water in the bottle'
-    longs: []
+    longs: !!null
 - OBJ_22:
     inventory: 'Oil in the bottle'
-    longs: []
+    longs: !!null
 - OBJ_23:
     inventory: '*mirror'
-    longs:
-    - ''
+    longs: !!null
 - OBJ_24:
     inventory: '*plant'
     longs:
@@ -1193,12 +1192,10 @@ object_descriptions: !!omap
     - 'There is a little axe lying beside the bear.'
 - OBJ_29:
     inventory: '*cave drawings'
-    longs:
-    - ''
+    longs: !!null
 - OBJ_30:
     inventory: '*pirate/genie'
-    longs:
-    - '' # never present
+    longs: !!null # never present
 - OBJ_31:
     inventory: '*dragon'
     longs:
@@ -1219,14 +1216,14 @@ object_descriptions: !!omap
     longs:
     - 'A burly troll stands by the bridge and insists you throw him a\ntreasure before you may cross.'
     - 'The troll steps out from beneath the bridge and blocks your way.'
-    - '  (chased away)'
+    - '' # chased away
     - 'The troll sounds quite adamant in his demand for a treasure.'
 - OBJ_34:
     inventory: '*phony troll'
     longs:
     - 'The troll is nowhere to be seen.'
 - OBJ_35:
-    inventory: '' # bear uses rtext 141
+    inventory: !!null # bear uses rtext 141
     longs:
     - 'There is a ferocious cave bear eying you from the far end of the room!'
     - 'There is a gentle cave bear sitting placidly in one corner.'
@@ -1239,8 +1236,7 @@ object_descriptions: !!omap
     - '"This is not the maze where the pirate leaves his treasure chest."'
 - OBJ_37:
     inventory: '*volcano and/or geyser'
-    longs:
-    - ''
+    longs: !!null
 - OBJ_38:
     inventory: '*vending machine'
     longs:
@@ -1257,8 +1253,7 @@ object_descriptions: !!omap
     - 'Some worn-out batteries have been discarded nearby.'
 - OBJ_40:
     inventory: '*carpet and/or moss and/or curtains'
-    longs:
-    - ''
+    longs: !!null
 - OBJ_41:
     inventory: '*ogre'
     longs:
@@ -1492,3 +1487,10 @@ object_descriptions: !!omap
     inventory: !!null
     longs: !!null
 
+obituaries:
+  - query: 'Oh dear, you seem to have gotten yourself killed.  I might be able to\nhelp you out, but I''ve never really done this before.  Do you want me\nto try to reincarnate you?'
+    yes_response: 'All right.  But don''t blame me if something goes wr......\n                    --- POOF!! ---\nYou are engulfed in a cloud of orange smoke.  Coughing and gasping,\nyou emerge from the smoke and find....'
+  - query: 'You clumsy oaf, you''ve done it again!  I don''t know how long I can\nkeep this up.  Do you want me to try reincarnating you again?'
+    yes_response: 'Okay, now where did I put my orange smoke?....  >POOF!<\nEverything 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\nme 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!'