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

Dragon attack code no longer edits the command struct.

Browse source 
This also fixes a minor bug where refusing to attack the dragon
costs the player two turns instead of one.
This commit is contained in:
Jason S. Ninneman 2017-07-12 13:49:28 -07:00
parent ff6a816e5f
commit 596a15457d
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
actions.c
View file

@ -101,13 +101,10 @@ static int attack(struct command_t *command)
* fixed), move rug there (not fixed), and move him there,
* too. Then do a null motion to get new description. */
rspeak(BARE_HANDS_QUERY);
if (silent_yes()) {
// FIXME: setting wd1 is a workaround for broken logic
command->wd1 = token_to_packed("Y");
} else {
// FIXME: setting wd1 is a workaround for broken logic
command->wd1 = token_to_packed("N");
return GO_CHECKFOO;
if (!silent_yes())
{
speak(arbitrary_messages[NASTY_DRAGON]);
return GO_MOVE;
}
state_change(DRAGON, DRAGON_DEAD);
game.prop[RUG] = RUG_FLOOR;

2
tests/barehands.chk
View file

@ -307,7 +307,7 @@ The blood-specked body of a huge green dead dragon lies to one side.
For crying out loud, the poor thing is already dead!
You scored 77 out of a possible 430, using 50 turns.
You scored 77 out of a possible 430, using 49 turns.
Your score qualifies you as a novice class adventurer.