Fix bug where knife hit might not be reported.

This commit is contained in:
Eric S. Raymond 2017-07-16 07:13:06 -04:00
parent 427bd23a10
commit 8bce57d3df
5 changed files with 64 additions and 5 deletions

View file

@ -2666,7 +2666,7 @@ arbitrary_messages: !!omap
- DWARF_SINGLE: 'There is a threatening little dwarf in the room with you!' - DWARF_SINGLE: 'There is a threatening little dwarf in the room with you!'
- KNIFE_THROWN: 'One sharp nasty knife is thrown at you!' - KNIFE_THROWN: 'One sharp nasty knife is thrown at you!'
- SAYS_PLUGH: 'A hollow voice says "PLUGH".' - SAYS_PLUGH: 'A hollow voice says "PLUGH".'
#- GETS_YOU: 'It gets you!' - GETS_YOU: 'It gets you!'
- MISSES_YOU: 'It misses!' - MISSES_YOU: 'It misses!'
- UNSURE_FACING: 'I am unsure how you are facing. Use compass points or nearby objects.' - UNSURE_FACING: 'I am unsure how you are facing. Use compass points or nearby objects.'
- NO_INOUT_HERE: |- - NO_INOUT_HERE: |-

2
main.c
View file

@ -448,7 +448,7 @@ static bool dwarfmove(void)
rspeak(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT), stick); rspeak(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT), stick);
} else { } else {
rspeak(KNIFE_THROWN); rspeak(KNIFE_THROWN);
rspeak(MISSES_YOU); rspeak(stick ? GETS_YOU : MISSES_YOU);
} }
if (stick == 0) if (stick == 0)
return true; return true;

View file

@ -2174,9 +2174,64 @@ You're on west bank of fissure.
A crystal bridge spans the fissure. A crystal bridge spans the fissure.
> inven
You scored 217 out of a possible 430, using 362 turns. You are currently holding the following:
Brass lantern
Black rod
Batteries
> e
You're on east bank of fissure.
A crystal bridge spans the fissure.
> e
There is a threatening little dwarf in the room with you!
One sharp nasty knife is thrown at you!
It gets you!
You clumsy oaf, you've done it again! I don''t know how long I can
keep this up. Do you want me to try reincarnating you again?
> y
Okay, now where did I put my orange smoke?.... >POOF!<
Everything disappears in a dense cloud of orange smoke.
You're inside building.
There is a richly-carved ebony statuette here!
There is an emerald here the size of a plover's egg!
There is a jewel-encrusted trident here!
A small velvet pillow lies on the floor.
There is a platinum pyramid here, 8 inches on a side!
There are diamonds here!
There is an enormous ruby here!
There are bars of silver here!
There is a persian rug spread out on the floor!
There is a large sparkling nugget of gold here!
A precious jade necklace has been dropped here!
There is precious jewelry here!
You scored 207 out of a possible 430, using 365 turns.
You may now consider yourself a "Seasoned Adventurer". You may now consider yourself a "Seasoned Adventurer".
To achieve the next higher rating, you need 34 more points. To achieve the next higher rating, you need 44 more points.

View file

@ -378,3 +378,7 @@ e
e e
# PARALLEL1 coverage # PARALLEL1 coverage
n n
inven
e
e
y

View file

@ -678,7 +678,7 @@ There is a threatening little dwarf in the room with you!
One sharp nasty knife is thrown at you! One sharp nasty knife is thrown at you!
It misses! It gets you!
Oh dear, you seem to have gotten yourself killed. I might be able to Oh dear, you seem to have gotten yourself killed. I might be able to
help you out, but I've never really done this before. Do you want me help you out, but I've never really done this before. Do you want me