actions[] now has strings instead of enums.
This commit is contained in:
parent
88477f1175
commit
ad24add3c0
3 changed files with 176 additions and 181 deletions
62
actions.c
62
actions.c
|
@ -173,7 +173,7 @@ static int attack(struct command_t *command)
|
||||||
rspeak(ROCKY_TROLL);
|
rspeak(ROCKY_TROLL);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
}
|
}
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
@ -264,7 +264,7 @@ static int vbreak(token_t verb, token_t obj)
|
||||||
game.fixed[VASE] = IS_FIXED;
|
game.fixed[VASE] = IS_FIXED;
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return (GO_CLEAROBJ);
|
return (GO_CLEAROBJ);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -451,7 +451,7 @@ static int discard(token_t verb, token_t obj, bool just_do_it)
|
||||||
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
|
if (TOTING(ROD2) && obj == ROD && !TOTING(ROD))
|
||||||
obj = ROD2;
|
obj = ROD2;
|
||||||
if (!TOTING(obj)) {
|
if (!TOTING(obj)) {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
if (obj == BIRD && HERE(SNAKE)) {
|
if (obj == BIRD && HERE(SNAKE)) {
|
||||||
|
@ -552,7 +552,7 @@ static int drink(token_t verb, token_t obj)
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -584,7 +584,7 @@ static int eat(token_t verb, token_t obj)
|
||||||
rspeak(LOST_APPETITE);
|
rspeak(LOST_APPETITE);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -623,7 +623,7 @@ static int extinguish(token_t verb, int obj)
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -656,7 +656,7 @@ static int feed(token_t verb, token_t obj)
|
||||||
game.dflag += 2;
|
game.dflag += 2;
|
||||||
rspeak(REALLY_MAD);
|
rspeak(REALLY_MAD);
|
||||||
} else
|
} else
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
break;
|
break;
|
||||||
case BEAR:
|
case BEAR:
|
||||||
if (game.prop[BEAR] == BEAR_DEAD) {
|
if (game.prop[BEAR] == BEAR_DEAD) {
|
||||||
|
@ -673,13 +673,13 @@ static int feed(token_t verb, token_t obj)
|
||||||
rspeak(NOTHING_EDIBLE);
|
rspeak(NOTHING_EDIBLE);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
break;
|
break;
|
||||||
case OGRE:
|
case OGRE:
|
||||||
if (HERE(FOOD))
|
if (HERE(FOOD))
|
||||||
rspeak(OGRE_FULL);
|
rspeak(OGRE_FULL);
|
||||||
else
|
else
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
rspeak(AM_GAME);
|
rspeak(AM_GAME);
|
||||||
|
@ -735,7 +735,7 @@ int fill(token_t verb, token_t obj)
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
if (obj != NO_OBJECT && obj != BOTTLE) {
|
if (obj != NO_OBJECT && obj != BOTTLE) {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
if (obj == NO_OBJECT && !HERE(BOTTLE))
|
if (obj == NO_OBJECT && !HERE(BOTTLE))
|
||||||
|
@ -784,7 +784,7 @@ static int find(token_t verb, token_t obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -804,7 +804,7 @@ static int fly(token_t verb, token_t obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (obj != RUG) {
|
if (obj != RUG) {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
if (game.prop[RUG] != RUG_HOVER) {
|
if (game.prop[RUG] != RUG_HOVER) {
|
||||||
|
@ -866,7 +866,7 @@ static int light(token_t verb, token_t obj)
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
} else {
|
} else {
|
||||||
if (obj != LAMP) {
|
if (obj != LAMP) {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
if (game.limit < 0) {
|
if (game.limit < 0) {
|
||||||
|
@ -984,7 +984,7 @@ static int lock(token_t verb, token_t obj)
|
||||||
rspeak(CANNOT_UNLOCK);
|
rspeak(CANNOT_UNLOCK);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
}
|
}
|
||||||
|
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
|
@ -1000,7 +1000,7 @@ static int pour(token_t verb, token_t obj)
|
||||||
if (obj == NO_OBJECT)
|
if (obj == NO_OBJECT)
|
||||||
return GO_UNKNOWN;
|
return GO_UNKNOWN;
|
||||||
if (!TOTING(obj)) {
|
if (!TOTING(obj)) {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1064,7 +1064,7 @@ static int read(struct command_t command)
|
||||||
game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
|
game.clshnt = yes(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
|
||||||
} else if (objects[command.obj].texts[0] == NULL ||
|
} else if (objects[command.obj].texts[0] == NULL ||
|
||||||
game.prop[command.obj] < 0) {
|
game.prop[command.obj] < 0) {
|
||||||
rspeak(actions[command.verb].message);
|
speak(actions[command.verb].message);
|
||||||
} else
|
} else
|
||||||
pspeak(command.obj, study, game.prop[command.obj], true);
|
pspeak(command.obj, study, game.prop[command.obj], true);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
|
@ -1104,7 +1104,7 @@ static int rub(token_t verb, token_t obj)
|
||||||
} else if (obj != LAMP) {
|
} else if (obj != LAMP) {
|
||||||
rspeak(PECULIAR_NOTHING);
|
rspeak(PECULIAR_NOTHING);
|
||||||
} else {
|
} else {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
}
|
}
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
@ -1150,7 +1150,7 @@ static int throw (struct command_t *command)
|
||||||
* troll. Treasures special for troll. */
|
* troll. Treasures special for troll. */
|
||||||
{
|
{
|
||||||
if (!TOTING(command->obj)) {
|
if (!TOTING(command->obj)) {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
if (objects[command->obj].is_treasure && AT(TROLL)) {
|
if (objects[command->obj].is_treasure && AT(TROLL)) {
|
||||||
|
@ -1209,7 +1209,7 @@ static int wake(token_t verb, token_t obj)
|
||||||
{
|
{
|
||||||
if (obj != DWARF ||
|
if (obj != DWARF ||
|
||||||
!game.closed) {
|
!game.closed) {
|
||||||
rspeak(actions[verb].message);
|
speak(actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
} else {
|
} else {
|
||||||
rspeak(PROD_DWARF);
|
rspeak(PROD_DWARF);
|
||||||
|
@ -1225,9 +1225,9 @@ static int wave(token_t verb, token_t obj)
|
||||||
(!HERE(BIRD) &&
|
(!HERE(BIRD) &&
|
||||||
(game.closng ||
|
(game.closng ||
|
||||||
!AT(FISSURE)))) {
|
!AT(FISSURE)))) {
|
||||||
rspeak(((!TOTING(obj)) && (obj != ROD ||
|
speak(((!TOTING(obj)) && (obj != ROD ||
|
||||||
!TOTING(ROD2))) ?
|
!TOTING(ROD2))) ?
|
||||||
ARENT_CARRYING :
|
arbitrary_messages[ARENT_CARRYING] :
|
||||||
actions[verb].message);
|
actions[verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
|
@ -1356,7 +1356,7 @@ int action(struct command_t *command)
|
||||||
case TAME:
|
case TAME:
|
||||||
return GO_UNKNOWN;
|
return GO_UNKNOWN;
|
||||||
case GO: {
|
case GO: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case ATTACK:
|
case ATTACK:
|
||||||
|
@ -1441,11 +1441,11 @@ int action(struct command_t *command)
|
||||||
case WAVE:
|
case WAVE:
|
||||||
return wave(command->verb, command->obj);
|
return wave(command->verb, command->obj);
|
||||||
case TAME: {
|
case TAME: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case GO: {
|
case GO: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case ATTACK:
|
case ATTACK:
|
||||||
|
@ -1461,7 +1461,7 @@ int action(struct command_t *command)
|
||||||
case THROW:
|
case THROW:
|
||||||
return throw (command);
|
return throw (command);
|
||||||
case QUIT: {
|
case QUIT: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case FIND:
|
case FIND:
|
||||||
|
@ -1476,7 +1476,7 @@ int action(struct command_t *command)
|
||||||
blast();
|
blast();
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
case SCORE: {
|
case SCORE: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case FEE:
|
case FEE:
|
||||||
|
@ -1484,11 +1484,11 @@ int action(struct command_t *command)
|
||||||
case FOE:
|
case FOE:
|
||||||
case FOO:
|
case FOO:
|
||||||
case FUM: {
|
case FUM: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case BRIEF: {
|
case BRIEF: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case READ:
|
case READ:
|
||||||
|
@ -1498,17 +1498,17 @@ int action(struct command_t *command)
|
||||||
case WAKE:
|
case WAKE:
|
||||||
return wake(command->verb, command->obj);
|
return wake(command->verb, command->obj);
|
||||||
case SAVE: {
|
case SAVE: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case RESUME: {
|
case RESUME: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case FLY:
|
case FLY:
|
||||||
return fly(command->verb, command->obj);
|
return fly(command->verb, command->obj);
|
||||||
case LISTEN: {
|
case LISTEN: {
|
||||||
rspeak(actions[command->verb].message);
|
speak(actions[command->verb].message);
|
||||||
return GO_CLEAROBJ;
|
return GO_CLEAROBJ;
|
||||||
}
|
}
|
||||||
case PART:
|
case PART:
|
||||||
|
|
291
adventure.yaml
291
adventure.yaml
|
@ -270,133 +270,6 @@ motions: !!omap
|
||||||
- FORWARD6:
|
- FORWARD6:
|
||||||
words: ['main', 'offic']
|
words: ['main', 'offic']
|
||||||
|
|
||||||
actions: !!omap
|
|
||||||
- ACT_0:
|
|
||||||
message: !!null
|
|
||||||
words: !!null
|
|
||||||
- CARRY:
|
|
||||||
message: ALREADY_CARRYING
|
|
||||||
words: ['g', 'carry', 'take', 'keep', 'catch',
|
|
||||||
'steal', 'captu', 'get', 'tote', 'snarf']
|
|
||||||
oldstyle: false
|
|
||||||
- DROP:
|
|
||||||
message: ARENT_CARRYING
|
|
||||||
words: ['drop', 'relea', 'free', 'disca', 'dump']
|
|
||||||
- SAY:
|
|
||||||
message: NO_MESSAGE
|
|
||||||
words: ['say', 'chant', 'sing', 'utter', 'mumbl']
|
|
||||||
- UNLOCK:
|
|
||||||
message: NOT_LOCKABLE
|
|
||||||
words: ['unloc', 'open']
|
|
||||||
- NOTHING:
|
|
||||||
message: NO_MESSAGE
|
|
||||||
words: ['z', 'nothi']
|
|
||||||
oldstyle: false
|
|
||||||
- LOCK:
|
|
||||||
message: NOT_LOCKABLE
|
|
||||||
words: ['lock', 'close']
|
|
||||||
- LIGHT:
|
|
||||||
message: DONT_UNDERSTAND
|
|
||||||
words: ['light', 'on']
|
|
||||||
- EXTINGUISH:
|
|
||||||
message: DONT_UNDERSTAND
|
|
||||||
words: ['extin', 'off']
|
|
||||||
- WAVE:
|
|
||||||
message: NOTHING_HAPPENS
|
|
||||||
words: ['wave', 'shake', 'swing']
|
|
||||||
- TAME:
|
|
||||||
message: AM_GAME
|
|
||||||
words: ['calm', 'placa', 'tame']
|
|
||||||
- GO:
|
|
||||||
message: WHERE_QUERY
|
|
||||||
words: ['walk', 'run', 'trave', 'go', 'proce',
|
|
||||||
'conti', 'explo', 'follo', 'turn']
|
|
||||||
- ATTACK:
|
|
||||||
message: RIDICULOUS_ATTEMPT
|
|
||||||
words: ['attac', 'kill', 'fight', 'hit', 'strik', 'slay']
|
|
||||||
- POUR:
|
|
||||||
message: ARENT_CARRYING
|
|
||||||
words: ['pour']
|
|
||||||
- EAT:
|
|
||||||
message: RIDICULOUS_ATTEMPT
|
|
||||||
words: ['eat', 'devou']
|
|
||||||
- DRINK:
|
|
||||||
message: STREAM_WATER
|
|
||||||
words: ['drink']
|
|
||||||
- RUB:
|
|
||||||
message: RUB_NOGO
|
|
||||||
words: ['rub']
|
|
||||||
- THROW:
|
|
||||||
message: ARENT_CARRYING
|
|
||||||
words: ['throw', 'toss']
|
|
||||||
- QUIT:
|
|
||||||
message: HUH_MAN
|
|
||||||
words: ['quit']
|
|
||||||
- FIND:
|
|
||||||
message: NEARBY
|
|
||||||
words: ['find', 'where']
|
|
||||||
- INVENTORY:
|
|
||||||
message: NEARBY
|
|
||||||
words: ['i', 'inven']
|
|
||||||
oldstyle: false
|
|
||||||
- FEED:
|
|
||||||
message: NO_EDIBLES
|
|
||||||
words: ['feed']
|
|
||||||
- FILL:
|
|
||||||
message: CANT_FILL
|
|
||||||
words: ['fill']
|
|
||||||
- BLAST:
|
|
||||||
message: REQUIRES_DYNAMITE
|
|
||||||
words: ['blast', 'deton', 'ignit', 'blowu']
|
|
||||||
- SCORE:
|
|
||||||
message: HUH_MAN
|
|
||||||
words: ['score']
|
|
||||||
- FEE:
|
|
||||||
message: NOT_KNOWHOW
|
|
||||||
words: ['fee']
|
|
||||||
- FIE:
|
|
||||||
message: NOT_KNOWHOW
|
|
||||||
words: ['fie']
|
|
||||||
- FOE:
|
|
||||||
message: NOT_KNOWHOW
|
|
||||||
words: ['foe']
|
|
||||||
- FOO:
|
|
||||||
message: NOT_KNOWHOW
|
|
||||||
words: ['foo']
|
|
||||||
- FUM:
|
|
||||||
message: NOT_KNOWHOW
|
|
||||||
words: ['fum']
|
|
||||||
- BRIEF:
|
|
||||||
message: ON_WHAT
|
|
||||||
words: ['brief']
|
|
||||||
- READ:
|
|
||||||
message: DONT_UNDERSTAND
|
|
||||||
words: ['read', 'perus']
|
|
||||||
- BREAK:
|
|
||||||
message: BEYOND_POWER
|
|
||||||
words: ['break', 'shatt', 'smash']
|
|
||||||
- WAKE:
|
|
||||||
message: RIDICULOUS_ATTEMPT
|
|
||||||
words: ['wake', 'distu']
|
|
||||||
- SAVE:
|
|
||||||
message: HUH_MAN
|
|
||||||
words: ['suspe', 'pause', 'save']
|
|
||||||
- RESUME:
|
|
||||||
message: HUH_MAN
|
|
||||||
words: ['resum', 'resta']
|
|
||||||
- FLY:
|
|
||||||
message: AM_GAME
|
|
||||||
words: ['fly']
|
|
||||||
- LISTEN:
|
|
||||||
message: DONT_UNDERSTAND
|
|
||||||
words: ['liste']
|
|
||||||
- PART:
|
|
||||||
message: NOTHING_HAPPENS
|
|
||||||
words: ['z''zzz']
|
|
||||||
- ACT_35:
|
|
||||||
message: HUH_MAN
|
|
||||||
words: !!null
|
|
||||||
|
|
||||||
hints:
|
hints:
|
||||||
- hint: &grate
|
- hint: &grate
|
||||||
name: CAVE
|
name: CAVE
|
||||||
|
@ -2798,7 +2671,7 @@ arbitrary_messages: !!omap
|
||||||
I don't know in from out here. Use compass points or name something
|
I don't know in from out here. Use compass points or name something
|
||||||
in the general direction you want to go.
|
in the general direction you want to go.
|
||||||
- CANT_APPLY: 'I don''t know how to apply that word here.'
|
- CANT_APPLY: 'I don''t know how to apply that word here.'
|
||||||
- AM_GAME: 'I''m game. Would you care to explain how?'
|
- AM_GAME: &am_game 'I''m game. Would you care to explain how?'
|
||||||
- NO_MORE_DETAIL: |-
|
- NO_MORE_DETAIL: |-
|
||||||
Sorry, but I am not allowed to give more detail. I will repeat the
|
Sorry, but I am not allowed to give more detail. I will repeat the
|
||||||
long description of your location.
|
long description of your location.
|
||||||
|
@ -2806,27 +2679,27 @@ arbitrary_messages: !!omap
|
||||||
- W_IS_WEST: 'If you prefer, simply type w rather than west.'
|
- W_IS_WEST: 'If you prefer, simply type w rather than west.'
|
||||||
- REALLY_QUIT: 'Do you really want to quit now?'
|
- REALLY_QUIT: 'Do you really want to quit now?'
|
||||||
- PIT_FALL: 'You fell into a pit and broke every bone in your body!'
|
- PIT_FALL: 'You fell into a pit and broke every bone in your body!'
|
||||||
- ALREADY_CARRYING: 'You are already carrying it!'
|
- ALREADY_CARRYING: &already_carrying 'You are already carrying it!'
|
||||||
- YOU_JOKING: 'You can''t be serious!'
|
- YOU_JOKING: 'You can''t be serious!'
|
||||||
- BIRD_EVADES: |-
|
- BIRD_EVADES: |-
|
||||||
The bird seemed unafraid at first, but as you approach it becomes
|
The bird seemed unafraid at first, but as you approach it becomes
|
||||||
disturbed and you cannot catch it.
|
disturbed and you cannot catch it.
|
||||||
- CANNOT_CARRY: 'You can catch the bird, but you cannot carry it.'
|
- CANNOT_CARRY: 'You can catch the bird, but you cannot carry it.'
|
||||||
- NOTHING_LOCKED: 'There is nothing here with a lock!'
|
- NOTHING_LOCKED: 'There is nothing here with a lock!'
|
||||||
- ARENT_CARRYING: 'You aren''t carrying it!'
|
- ARENT_CARRYING: &arent_carrying 'You aren''t carrying it!'
|
||||||
- BIRD_ATTACKS: |-
|
- BIRD_ATTACKS: |-
|
||||||
The little bird attacks the green snake, and in an astounding flurry
|
The little bird attacks the green snake, and in an astounding flurry
|
||||||
drives the snake away.
|
drives the snake away.
|
||||||
- NO_KEYS: 'You have no keys!'
|
- NO_KEYS: 'You have no keys!'
|
||||||
- NO_LOCK: 'It has no lock.'
|
- NO_LOCK: 'It has no lock.'
|
||||||
- NOT_LOCKABLE: 'I don''t know how to lock or unlock such a thing.'
|
- NOT_LOCKABLE: ¬_lockable 'I don''t know how to lock or unlock such a thing.'
|
||||||
- ALREADY_LOCKED: 'It was already locked.'
|
- ALREADY_LOCKED: 'It was already locked.'
|
||||||
- ALREADY_UNLOCKED: 'It was already unlocked.'
|
- ALREADY_UNLOCKED: 'It was already unlocked.'
|
||||||
- BEAR_BLOCKS: |-
|
- BEAR_BLOCKS: |-
|
||||||
There is no way to get past the bear to unlock the chain, which is
|
There is no way to get past the bear to unlock the chain, which is
|
||||||
probably just as well.
|
probably just as well.
|
||||||
- NOTHING_HAPPENS: 'Nothing happens.'
|
- NOTHING_HAPPENS: ¬hing_happens 'Nothing happens.'
|
||||||
- WHERE_QUERY: 'Where?'
|
- WHERE_QUERY: &where_query 'Where?'
|
||||||
- NO_TARGET: 'There is nothing here to attack.'
|
- NO_TARGET: 'There is nothing here to attack.'
|
||||||
- BIRD_DEAD: 'The little bird is now dead. Its body disappears.'
|
- BIRD_DEAD: 'The little bird is now dead. Its body disappears.'
|
||||||
- SNAKE_WARNING: 'Attacking the snake both doesn''t work and is very dangerous.'
|
- SNAKE_WARNING: 'Attacking the snake both doesn''t work and is very dangerous.'
|
||||||
|
@ -2844,22 +2717,16 @@ arbitrary_messages: !!omap
|
||||||
I don't know where the cave is, but hereabouts no stream can run on
|
I don't know where the cave is, but hereabouts no stream can run on
|
||||||
the surface for long. I would try the stream.
|
the surface for long. I would try the stream.
|
||||||
- NEED_DETAIL: 'I need more detailed instructions to do that.'
|
- NEED_DETAIL: 'I need more detailed instructions to do that.'
|
||||||
- NEARBY: |-
|
- NEARBY: &nearby |-
|
||||||
I can only tell you what you see as you move about and manipulate
|
I can only tell you what you see as you move about and manipulate
|
||||||
things. I cannot tell you where remote things are.
|
things. I cannot tell you where remote things are.
|
||||||
- OGRE_SNARL: 'The ogre snarls and shoves you back.'
|
- OGRE_SNARL: 'The ogre snarls and shoves you back.'
|
||||||
- HUH_MAN: 'Huh?'
|
- HUH_MAN: &huh_man 'Huh?'
|
||||||
- WELCOME_YOU: 'Welcome to Adventure!! Would you like instructions?'
|
- WELCOME_YOU: 'Welcome to Adventure!! Would you like instructions?'
|
||||||
- REQUIRES_DYNAMITE: 'Blasting requires dynamite.'
|
- REQUIRES_DYNAMITE: &requires_dynamite 'Blasting requires dynamite.'
|
||||||
- FEET_WET: 'Your feet are now wet.'
|
- FEET_WET: 'Your feet are now wet.'
|
||||||
- LOST_APPETITE: 'I think I just lost my appetite.'
|
- LOST_APPETITE: 'I think I just lost my appetite.'
|
||||||
- THANKS_DELICIOUS: 'Thank you, it was delicious!'
|
- THANKS_DELICIOUS: 'Thank you, it was delicious!'
|
||||||
- STREAM_WATER: |-
|
|
||||||
You have taken a drink from the stream. The water tastes strongly of
|
|
||||||
minerals, but is not unpleasant. It is extremely cold.
|
|
||||||
- RUB_NOGO: |-
|
|
||||||
Rubbing the electric lamp is not particularly rewarding. Anyway,
|
|
||||||
nothing exciting happens.
|
|
||||||
- PECULIAR_NOTHING: 'Peculiar. Nothing unexpected happens.'
|
- PECULIAR_NOTHING: 'Peculiar. Nothing unexpected happens.'
|
||||||
- GROUND_WET: 'Your bottle is empty and the ground is wet.'
|
- GROUND_WET: 'Your bottle is empty and the ground is wet.'
|
||||||
- CANT_POUR: 'You can''t pour that.'
|
- CANT_POUR: 'You can''t pour that.'
|
||||||
|
@ -2882,8 +2749,7 @@ arbitrary_messages: !!omap
|
||||||
- NO_CONTAINER: 'You have nothing in which to carry it.'
|
- NO_CONTAINER: 'You have nothing in which to carry it.'
|
||||||
- BOTTLE_FULL: 'Your bottle is already full.'
|
- BOTTLE_FULL: 'Your bottle is already full.'
|
||||||
- NO_LIQUID: 'There is nothing here with which to fill the bottle.'
|
- NO_LIQUID: 'There is nothing here with which to fill the bottle.'
|
||||||
- CANT_FILL: 'You can''t fill that.'
|
- RIDICULOUS_ATTEMPT: &ridiculous_attempt 'Don''t be ridiculous!'
|
||||||
- RIDICULOUS_ATTEMPT: 'Don''t be ridiculous!'
|
|
||||||
- RUSTY_DOOR: 'The door is extremely rusty and refuses to open.'
|
- 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?"'
|
- SHAKING_LEAVES: 'The plant indignantly shakes the oil off its leaves and asks, "Water?"'
|
||||||
- DEEP_ROOTS: 'The plant has exceptionally deep roots and cannot be pulled free.'
|
- DEEP_ROOTS: 'The plant has exceptionally deep roots and cannot be pulled free.'
|
||||||
|
@ -2949,7 +2815,7 @@ arbitrary_messages: !!omap
|
||||||
- WITHOUT_SUSPENDS: 'Now let''s see you do it without suspending in mid-Adventure.'
|
- WITHOUT_SUSPENDS: 'Now let''s see you do it without suspending in mid-Adventure.'
|
||||||
- FILL_INVALID: 'There is nothing here with which to fill it.'
|
- FILL_INVALID: 'There is nothing here with which to fill it.'
|
||||||
- SHATTER_VASE: 'The sudden change in temperature has delicately shattered the vase.'
|
- SHATTER_VASE: 'The sudden change in temperature has delicately shattered the vase.'
|
||||||
- BEYOND_POWER: 'It is beyond your power to do that.'
|
- BEYOND_POWER: &beyond_power 'It is beyond your power to do that.'
|
||||||
- NOT_KNOWHOW: ¬_knowhow 'I don''t know how.'
|
- NOT_KNOWHOW: ¬_knowhow 'I don''t know how.'
|
||||||
- TOO_FAR: 'It is too far up for you to reach.'
|
- TOO_FAR: 'It is too far up for you to reach.'
|
||||||
- DWARF_SMOKE: |-
|
- DWARF_SMOKE: |-
|
||||||
|
@ -2963,7 +2829,6 @@ arbitrary_messages: !!omap
|
||||||
- BIRD_BURNT: |-
|
- BIRD_BURNT: |-
|
||||||
The little bird attacks the green dragon, and in an astounding flurry
|
The little bird attacks the green dragon, and in an astounding flurry
|
||||||
gets burnt to a cinder. The ashes blow away.
|
gets burnt to a cinder. The ashes blow away.
|
||||||
- ON_WHAT: 'On what?'
|
|
||||||
- BRIEF_CONFIRM: |-
|
- BRIEF_CONFIRM: |-
|
||||||
Okay, from now on I'll only describe a place in full the first time
|
Okay, from now on I'll only describe a place in full the first time
|
||||||
you come to it. To get the full description, say "look".
|
you come to it. To get the full description, say "look".
|
||||||
|
@ -2984,7 +2849,6 @@ arbitrary_messages: !!omap
|
||||||
- CHAIN_UNLOCKED: 'The chain is now unlocked.'
|
- CHAIN_UNLOCKED: 'The chain is now unlocked.'
|
||||||
- CHAIN_LOCKED: 'The chain is now locked.'
|
- CHAIN_LOCKED: 'The chain is now locked.'
|
||||||
- NO_LOCKSITE: 'There is nothing here to which the chain can be locked.'
|
- NO_LOCKSITE: 'There is nothing here to which the chain can be locked.'
|
||||||
- NO_EDIBLES: 'There is nothing here to eat.'
|
|
||||||
- WANT_HINT: 'Do you want the hint?'
|
- WANT_HINT: 'Do you want the hint?'
|
||||||
- TROLL_VICES: 'Gluttony is not one of the troll''s vices. Avarice, however, is.'
|
- TROLL_VICES: 'Gluttony is not one of the troll''s vices. Avarice, however, is.'
|
||||||
- LAMP_DIM: |-
|
- LAMP_DIM: |-
|
||||||
|
@ -3015,7 +2879,7 @@ arbitrary_messages: !!omap
|
||||||
- WAYOUT_CLUE: |-
|
- WAYOUT_CLUE: |-
|
||||||
It says, "There is a way out of this place. Do you need any more
|
It says, "There is a way out of this place. Do you need any more
|
||||||
information to escape? Sorry, but this initial hint is all you get."
|
information to escape? Sorry, but this initial hint is all you get."
|
||||||
- DONT_UNDERSTAND: 'I''m afraid I don''t understand.'
|
- DONT_UNDERSTAND: &dont_understand 'I''m afraid I don''t understand.'
|
||||||
- HAND_PASSTHROUGH: 'Your hand passes through it as though it weren''t there.'
|
- HAND_PASSTHROUGH: 'Your hand passes through it as though it weren''t there.'
|
||||||
- BREAK_MIRROR: |-
|
- BREAK_MIRROR: |-
|
||||||
You strike the mirror a resounding blow, whereupon it shatters into a
|
You strike the mirror a resounding blow, whereupon it shatters into a
|
||||||
|
@ -3877,6 +3741,137 @@ obituaries:
|
||||||
me to do a decent reincarnation without any orange smoke, do you?
|
me 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!'
|
yes_response: 'Okay, if you''re so smart, do it yourself! I''m leaving!'
|
||||||
|
|
||||||
|
actions: !!omap
|
||||||
|
- ACT_0:
|
||||||
|
message: !!null
|
||||||
|
words: !!null
|
||||||
|
- CARRY:
|
||||||
|
message: *already_carrying
|
||||||
|
words: ['g', 'carry', 'take', 'keep', 'catch',
|
||||||
|
'steal', 'captu', 'get', 'tote', 'snarf']
|
||||||
|
oldstyle: false
|
||||||
|
- DROP:
|
||||||
|
message: *arent_carrying
|
||||||
|
words: ['drop', 'relea', 'free', 'disca', 'dump']
|
||||||
|
- SAY:
|
||||||
|
message: NO_MESSAGE
|
||||||
|
words: ['say', 'chant', 'sing', 'utter', 'mumbl']
|
||||||
|
- UNLOCK:
|
||||||
|
message: *not_lockable
|
||||||
|
words: ['unloc', 'open']
|
||||||
|
- NOTHING:
|
||||||
|
message: NO_MESSAGE
|
||||||
|
words: ['z', 'nothi']
|
||||||
|
oldstyle: false
|
||||||
|
- LOCK:
|
||||||
|
message: *not_lockable
|
||||||
|
words: ['lock', 'close']
|
||||||
|
- LIGHT:
|
||||||
|
message: *dont_understand
|
||||||
|
words: ['light', 'on']
|
||||||
|
- EXTINGUISH:
|
||||||
|
message: *dont_understand
|
||||||
|
words: ['extin', 'off']
|
||||||
|
- WAVE:
|
||||||
|
message: *nothing_happens
|
||||||
|
words: ['wave', 'shake', 'swing']
|
||||||
|
- TAME:
|
||||||
|
message: *am_game
|
||||||
|
words: ['calm', 'placa', 'tame']
|
||||||
|
- GO:
|
||||||
|
message: *where_query
|
||||||
|
words: ['walk', 'run', 'trave', 'go', 'proce',
|
||||||
|
'conti', 'explo', 'follo', 'turn']
|
||||||
|
- ATTACK:
|
||||||
|
message: *ridiculous_attempt
|
||||||
|
words: ['attac', 'kill', 'fight', 'hit', 'strik', 'slay']
|
||||||
|
- POUR:
|
||||||
|
message: *arent_carrying
|
||||||
|
words: ['pour']
|
||||||
|
- EAT:
|
||||||
|
message: *ridiculous_attempt
|
||||||
|
words: ['eat', 'devou']
|
||||||
|
- DRINK:
|
||||||
|
message: |-
|
||||||
|
You have taken a drink from the stream. The water tastes strongly of
|
||||||
|
minerals, but is not unpleasant. It is extremely cold.
|
||||||
|
words: ['drink']
|
||||||
|
- RUB:
|
||||||
|
message: |-
|
||||||
|
Rubbing the electric lamp is not particularly rewarding. Anyway,
|
||||||
|
nothing exciting happens.
|
||||||
|
words: ['rub']
|
||||||
|
- THROW:
|
||||||
|
message: *arent_carrying
|
||||||
|
words: ['throw', 'toss']
|
||||||
|
- QUIT:
|
||||||
|
message: *huh_man
|
||||||
|
words: ['quit']
|
||||||
|
- FIND:
|
||||||
|
message: *nearby
|
||||||
|
words: ['find', 'where']
|
||||||
|
- INVENTORY:
|
||||||
|
message: *nearby
|
||||||
|
words: ['i', 'inven']
|
||||||
|
oldstyle: false
|
||||||
|
- FEED:
|
||||||
|
message: 'There is nothing here to eat.'
|
||||||
|
words: ['feed']
|
||||||
|
- FILL:
|
||||||
|
message: 'You can''t fill that.'
|
||||||
|
words: ['fill']
|
||||||
|
- BLAST:
|
||||||
|
message: *requires_dynamite
|
||||||
|
words: ['blast', 'deton', 'ignit', 'blowu']
|
||||||
|
- SCORE:
|
||||||
|
message: *huh_man
|
||||||
|
words: ['score']
|
||||||
|
- FEE:
|
||||||
|
message: *not_knowhow
|
||||||
|
words: ['fee']
|
||||||
|
- FIE:
|
||||||
|
message: *not_knowhow
|
||||||
|
words: ['fie']
|
||||||
|
- FOE:
|
||||||
|
message: *not_knowhow
|
||||||
|
words: ['foe']
|
||||||
|
- FOO:
|
||||||
|
message: *not_knowhow
|
||||||
|
words: ['foo']
|
||||||
|
- FUM:
|
||||||
|
message: *not_knowhow
|
||||||
|
words: ['fum']
|
||||||
|
- BRIEF:
|
||||||
|
message: 'On what?'
|
||||||
|
words: ['brief']
|
||||||
|
- READ:
|
||||||
|
message: *dont_understand
|
||||||
|
words: ['read', 'perus']
|
||||||
|
- BREAK:
|
||||||
|
message: *beyond_power
|
||||||
|
words: ['break', 'shatt', 'smash']
|
||||||
|
- WAKE:
|
||||||
|
message: *ridiculous_attempt
|
||||||
|
words: ['wake', 'distu']
|
||||||
|
- SAVE:
|
||||||
|
message: *huh_man
|
||||||
|
words: ['suspe', 'pause', 'save']
|
||||||
|
- RESUME:
|
||||||
|
message: *huh_man
|
||||||
|
words: ['resum', 'resta']
|
||||||
|
- FLY:
|
||||||
|
message: *am_game
|
||||||
|
words: ['fly']
|
||||||
|
- LISTEN:
|
||||||
|
message: *dont_understand
|
||||||
|
words: ['liste']
|
||||||
|
- PART:
|
||||||
|
message: *nothing_happens
|
||||||
|
words: ['z''zzz']
|
||||||
|
- ACT_35:
|
||||||
|
message: *huh_man
|
||||||
|
words: !!null
|
||||||
|
|
||||||
specials: !!omap
|
specials: !!omap
|
||||||
- SPC_0:
|
- SPC_0:
|
||||||
message: !!null
|
message: !!null
|
||||||
|
|
|
@ -141,7 +141,7 @@ typedef struct {{
|
||||||
|
|
||||||
typedef struct {{
|
typedef struct {{
|
||||||
const string_group_t words;
|
const string_group_t words;
|
||||||
const long message;
|
const char* message;
|
||||||
}} action_t;
|
}} action_t;
|
||||||
|
|
||||||
typedef struct {{
|
typedef struct {{
|
||||||
|
@ -763,7 +763,7 @@ if __name__ == "__main__":
|
||||||
get_hints(db["hints"], db["arbitrary_messages"]),
|
get_hints(db["hints"], db["arbitrary_messages"]),
|
||||||
get_condbits(db["locations"]),
|
get_condbits(db["locations"]),
|
||||||
get_motions(db["motions"]),
|
get_motions(db["motions"]),
|
||||||
get_actions(db["actions"]),
|
get_specials(db["actions"]),
|
||||||
get_specials(db["specials"]),
|
get_specials(db["specials"]),
|
||||||
bigdump(tkey),
|
bigdump(tkey),
|
||||||
get_travel(travel),
|
get_travel(travel),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue