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

Clear login in bvreak

Browse source 
Test double-breaking of vase
This commit is contained in:
NHOrus 2017-07-06 18:23:07 +03:00
parent 0a04293f23
commit cca3686f2f
3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
actions.c
View file

@ -248,23 +248,26 @@ static void blast(void)
static int vbreak(vocab_t verb, obj_t obj) static int vbreak(vocab_t verb, obj_t obj)
/* Break. Only works for mirror in repository and, of course, the vase. */ /* Break. Only works for mirror in repository and, of course, the vase. */
{ {
if (obj == MIRROR) { switch (obj) {
case MIRROR:
if (game.closed) { if (game.closed) {
rspeak(BREAK_MIRROR); rspeak(BREAK_MIRROR);
return GO_DWARFWAKE; return GO_DWARFWAKE;
} else { } else {
rspeak(TOO_FAR); rspeak(TOO_FAR);
return GO_CLEAROBJ; break;
} }
case VASE:
if (game.prop[VASE] == VASE_WHOLE) {
if (TOTING(VASE))
drop(VASE, game.loc);
state_change(VASE, VASE_BROKEN);
game.fixed[VASE] = IS_FIXED;
break;
}
default:
speak(actions[verb].message);
} }
if (obj == VASE && game.prop[VASE] == VASE_WHOLE) {
if (TOTING(VASE))
drop(VASE, game.loc);
state_change(VASE, VASE_BROKEN);
game.fixed[VASE] = IS_FIXED;
return GO_CLEAROBJ;
}
speak(actions[verb].message);
return (GO_CLEAROBJ); return (GO_CLEAROBJ);
} }

6
tests/breakvase.chk
View file

@ -1298,6 +1298,10 @@ OK
You have taken the vase and hurled it delicately to the ground. You have taken the vase and hurled it delicately to the ground.
> break vase
It is beyond your power to do that.
> quit > quit
Do you really want to quit now? Do you really want to quit now?
@ -1306,7 +1310,7 @@ Do you really want to quit now?
OK OK
You scored 139 out of a possible 430, using 211 turns. You scored 139 out of a possible 430, using 212 turns.
You have achieved the rating: "Experienced Adventurer". You have achieved the rating: "Experienced Adventurer".

1
tests/breakvase.log
View file

@ -216,5 +216,6 @@ s
# Previous was just setup - this is the real test # Previous was just setup - this is the real test
take vase take vase
break vase break vase
break vase
quit quit
yes yes