nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

silver vs poly'd hero (trunk only)

Browse Source 
<Someone> reported that thitu() was adding d20 damage for silver object
hitting silver-hating hero even though all the callers were using dmgval()
which also does that, resulting in doubled silver bonus/penalty.  This
fixes that (including for boomerangs thrown by player, which weren't using
dmgval(), to handle a hyptothetical silver boomerang).  While testing it,
I noticed that there was no "the silver sears your flesh" message when a
monster hit you with a wielded silver weapon, so this fixes that too.
(How did we miss that?  And how did <Someone>? :-)
This commit is contained in:
nethack.rankin
2006-04-06 05:57:50 +00:00
parent 820f3f70d9
commit 27dcb8e34a
6 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dothrow.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)dothrow.c 3.5 2005/12/02 */
/* SCCS Id: @(#)dothrow.c 3.5 2006/04/05 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -949,7 +949,7 @@ boolean twoweap; /* used to restore twoweapon mode if wielded weapon returns */
} else if(obj->otyp == BOOMERANG && !Underwater) {
if(Is_airlevel(&u.uz) || Levitation)
hurtle(-u.dx, -u.dy, 1, TRUE);
mon = boomhit(u.dx, u.dy);
mon = boomhit(obj, u.dx, u.dy);
if(mon == &youmonst) { /* the thing was caught */
exercise(A_DEX, TRUE);
obj = addinv(obj);