archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More repairs on search-replace results.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-18 22:31:58 -04:00
parent 962054cc26
commit 7675b52562
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
adventure.text
View file

@ -1256,7 +1256,7 @@
1058 POTTE 1058 POTTE
1059 EMERA 1059 EMERA
1060 PLATI 1060 PLATI
1060 PYRAMID 1060 PYRAM
1061 PEARL 1061 PEARL
1062 RUG 1062 RUG
1062 PERSI 1062 PERSI

6
adventure.yaml
View file

@ -449,7 +449,7 @@ locations: !!omap
short: 'You''re at top of stalactite.' short: 'You''re at top of stalactite.'
- LOC_DIFFERENT2: - LOC_DIFFERENT2:
description: 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 short: !!null
- LOC_RESERVOIR: - LOC_RESERVOIR:
description: description:
@ -932,8 +932,8 @@ arbitrary_messages: !!omap
- LAMP_OUT: 'Your lamp has run out of power.' - LAMP_OUT: 'Your lamp has run out of power.'
- PLEASE_ANSWER: 'Please answer the question.' - 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.' - 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.' - GET_BATTERIES: '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.' - 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.' - 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.' - 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?' - OGRE_QUERY: 'Do you need help dealing with the ogre?'

4
main.c
View file

@ -841,7 +841,7 @@ static void lampcheck(void)
* goes out. Even then, he can explore outside for a while * goes out. Even then, he can explore outside for a while
* if desired. */ * if desired. */
if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == 0 && HERE(LAMP)) { if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == 0 && HERE(LAMP)) {
RSPEAK(REPLACE_BATTERYIES); RSPEAK(REPLACE_BATTERIES);
game.prop[BATTERY] = 1; game.prop[BATTERY] = 1;
if (TOTING(BATTERY)) if (TOTING(BATTERY))
DROP(BATTERY, game.loc); DROP(BATTERY, game.loc);
@ -855,7 +855,7 @@ static void lampcheck(void)
} else if (game.limit <= WARNTIME) { } else if (game.limit <= WARNTIME) {
if (!game.lmwarn && HERE(LAMP)) { if (!game.lmwarn && HERE(LAMP)) {
game.lmwarn = true; game.lmwarn = true;
int spk = GET_BATTERYIES; int spk = GET_BATTERIES;
if (game.place[BATTERY] == NOWHERE)spk = LAMP_DIM; if (game.place[BATTERY] == NOWHERE)spk = LAMP_DIM;
if (game.prop[BATTERY] == 1)spk = MISSING_BATTERYIES; if (game.prop[BATTERY] == 1)spk = MISSING_BATTERYIES;
RSPEAK(spk); RSPEAK(spk);