From 7675b5256274b56ff897a988c44aa74cb4e6b89f Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Sun, 18 Jun 2017 22:31:58 -0400 Subject: [PATCH] More repairs on search-replace results. --- adventure.text | 2 +- adventure.yaml | 6 +++--- main.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adventure.text b/adventure.text index fd8144a..290a0d0 100644 --- a/adventure.text +++ b/adventure.text @@ -1256,7 +1256,7 @@ 1058 POTTE 1059 EMERA 1060 PLATI -1060 PYRAMID +1060 PYRAM 1061 PEARL 1062 RUG 1062 PERSI diff --git a/adventure.yaml b/adventure.yaml index 65fe2e5..48353c2 100644 --- a/adventure.yaml +++ b/adventure.yaml @@ -449,7 +449,7 @@ locations: !!omap short: 'You''re at top of stalactite.' - LOC_DIFFERENT2: description: - long: 'You are in a little maze of twisting passages, all different.' + long: '1You are in a little maze of twisting passages, all different.' short: !!null - LOC_RESERVOIR: description: @@ -932,8 +932,8 @@ arbitrary_messages: !!omap - LAMP_OUT: 'Your lamp has run out of power.' - PLEASE_ANSWER: 'Please answer the question.' - PIRATE_SPOTTED: 'There are faint rustling noises from the darkness behind you. As you\nturn toward them, the beam of your lamp falls across a bearded pirate.\nHe is carrying a large chest. "Shiver me timbers!" he cries, "I''ve\nbeen spotted! I''d best hie meself off to the maze to hide me chest!"\nWith that, he vanishes into the gloom.' -- GET_BATTERYIES: 'Your lamp is getting dim. You''d best go back for those batteries.' -- REPLACE_BATTERYIES: 'Your lamp is getting dim. I''m taking the liberty of replacing the\nbatteries.' +- GET_BATTERIES: 'Your lamp is getting dim. You''d best go back for those batteries.' +- REPLACE_BATTERIES: 'Your lamp is getting dim. I''m taking the liberty of replacing the\nbatteries.' - MISSING_BATTERYIES: 'Your lamp is getting dim, and you''re out of spare batteries. You''d\nbest start wrapping this up.' - REMOVE_MESSAGE: 'You sift your fingers through the dust, but succeed only in\nobliterating the cryptic message.' - OGRE_QUERY: 'Do you need help dealing with the ogre?' diff --git a/main.c b/main.c index c4892ff..b14e5ca 100644 --- a/main.c +++ b/main.c @@ -841,7 +841,7 @@ static void lampcheck(void) * goes out. Even then, he can explore outside for a while * if desired. */ if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == 0 && HERE(LAMP)) { - RSPEAK(REPLACE_BATTERYIES); + RSPEAK(REPLACE_BATTERIES); game.prop[BATTERY] = 1; if (TOTING(BATTERY)) DROP(BATTERY, game.loc); @@ -855,7 +855,7 @@ static void lampcheck(void) } else if (game.limit <= WARNTIME) { if (!game.lmwarn && HERE(LAMP)) { game.lmwarn = true; - int spk = GET_BATTERYIES; + int spk = GET_BATTERIES; if (game.place[BATTERY] == NOWHERE)spk = LAMP_DIM; if (game.prop[BATTERY] == 1)spk = MISSING_BATTERYIES; RSPEAK(spk); -- 2.31.1