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

fix B18012 - Werebane

Browse Source 
Make wielding Werebane confer defense against catching lychanthropy
from monster bites.  It doesn't protect against catching that from eating
lycanthrope corpses and might blast the character if wielded at such time.

     Also fix artifact handling to recognize the character as lycanthrope
while in normal human/elf/whatever form--rather than only when in beast
form--just like it does for monsters.
This commit is contained in:
nethack.rankin
2003-02-14 01:06:08 +00:00
parent a20dc69dee
commit 4496ca3d85
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/artifact.c
View File

@@ -579,8 +579,9 @@ struct monst *mtmp;
} else if (weap->spfx & SPFX_DFLAG1) {
return ((ptr->mflags1 & weap->mtype) != 0L);
} else if (weap->spfx & SPFX_DFLAG2) {
return ((ptr->mflags2 & weap->mtype) ||
(yours && !Upolyd && (urace.selfmask & weap->mtype)));
return ((ptr->mflags2 & weap->mtype) || (yours &&
((!Upolyd && (urace.selfmask & weap->mtype)) ||
((weap->mtype & M2_WERE) && u.ulycn >= LOW_PM))));
} else if (weap->spfx & SPFX_DALIGN) {
return yours ? (u.ualign.type != weap->alignment) :
(ptr->maligntyp == A_NONE ||

14
src/eat.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)eat.c 3.4 2002/09/25 */
/* SCCS Id: @(#)eat.c 3.4 2003/02/13 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -770,6 +770,7 @@ cpostfx(pm) /* called after completely consuming a corpse */
register int pm;
{
register int tmp = 0;
boolean catch_lycanthropy = FALSE;
/* in case `afternmv' didn't get called for previously mimicking
gold, clean up now to avoid `eatmbuf' memory leak */
@@ -795,12 +796,15 @@ register int pm;
pluslvl(FALSE);
break;
case PM_HUMAN_WERERAT:
catch_lycanthropy = TRUE;
u.ulycn = PM_WERERAT;
break;
case PM_HUMAN_WEREJACKAL:
catch_lycanthropy = TRUE;
u.ulycn = PM_WEREJACKAL;
break;
case PM_HUMAN_WEREWOLF:
catch_lycanthropy = TRUE;
u.ulycn = PM_WEREWOLF;
break;
case PM_NURSE:
@@ -952,6 +956,14 @@ register int pm;
}
break;
}
if (catch_lycanthropy && defends(AD_WERE, uwep)) {
if (!touch_artifact(uwep, &youmonst)) {
dropx(uwep);
uwepgone();
}
}
return;
}