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

Unspk'd bivalve action, exposing more untested surface

Browse source
This commit is contained in:
NHOrus 2017-07-03 06:46:24 +03:00
parent ac65f3fd5f
commit fc5267fe8b
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
actions.c
View file

@ -205,21 +205,26 @@ static int bigwords(token_t foo)
static int bivalve(token_t verb, token_t obj)
/* Clam/oyster actions */
{
int spk;
bool is_oyster = (obj == OYSTER);
spk = is_oyster ? OYSTER_OPENS : PEARL_FALLS;
if (TOTING(obj))
spk = is_oyster ? DROP_OYSTER : DROP_CLAM;
if (!TOTING(TRIDENT))
spk = is_oyster ? OYSTER_OPENER : CLAM_OPENER;
if (verb == LOCK)
spk = HUH_MAN;
if (spk == PEARL_FALLS) {
if (verb == LOCK) {
rspeak(HUH_MAN);
return GO_CLEAROBJ;
}
if (!TOTING(TRIDENT)) {
rspeak(is_oyster ? OYSTER_OPENER : CLAM_OPENER);
return GO_CLEAROBJ;
}
if (TOTING(obj)) {
rspeak( is_oyster ? DROP_OYSTER : DROP_CLAM);
return GO_CLEAROBJ;
}
if (!is_oyster) {
DESTROY(CLAM);
drop(OYSTER, game.loc);
drop(PEARL, LOC_CULDESAC);
}
rspeak(spk);
rspeak(is_oyster ? OYSTER_OPENS : PEARL_FALLS);
return GO_CLEAROBJ;
}