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

breaking wands (trunk only)

Browse Source 
From a bug report, polymorph of self due to
breaking a wand also polymorphed various items that were dropped in the
process, unlike the case of zapping polymorph at monsters which excludes
dropped items from being poly'd.  This polymorphs the pile at the hero's
feet before polymorphing the hero.  I first tried to handle it using
obj->bypass like with monsters, but that didn't work.  Post-3.4.3, the
bypass handling is also used for polyself (by retouch_equipment()) and
it was getting reset at an inconvenient time.

     He also complained that he failed to get "you feel shuddering
vibrations" when some polymorphed objects got destroyed.  That message
is issued by weffects() which do_break_wand() doesn't call.  It ought to
be fixed, but this patch doesn't address it.

     Lastly, add code to prevent objects guarded against polymorph via
obj->bypass from getting used up when creating polypile golems.
This commit is contained in:
nethack.rankin
2008-10-20 00:57:16 +00:00
parent 9a7c5194a0
commit b0478ecef8
3 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zap.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)zap.c 3.5 2008/03/19 */
/* SCCS Id: @(#)zap.c 3.5 2008/10/14 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1088,6 +1088,8 @@ struct obj *obj;
{
int zap_odds;
if (context.bypasses && obj->bypass) return FALSE;
if (obj->oclass == WAND_CLASS)
zap_odds = 3; /* half-life = 2 zaps */
else if (obj->cursed)
@@ -1117,6 +1119,7 @@ polyuse(objhdr, mat, minwt)
for(otmp = objhdr; minwt > 0 && otmp; otmp = otmp2) {
otmp2 = otmp->nexthere;
if (context.bypasses && otmp->bypass) continue;
if (otmp == uball || otmp == uchain) continue;
if (obj_resists(otmp, 0, 0)) continue; /* preserve unique objects */
#ifdef MAIL
@@ -1156,6 +1159,14 @@ create_polymon(obj, okind)
const char *material;
int pm_index;
if (context.bypasses) {
/* this is approximate because the "no golems" !obj->nexthere
check below doesn't understand bypassed objects; but it
should suffice since bypassed objects always end up as a
consecutive group at the top of their pile */
while (obj && obj->bypass) obj = obj->nexthere;
}
/* no golems if you zap only one object -- not enough stuff */
if(!obj || (!obj->nexthere && obj->quan == 1L)) return;