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

mind flayer brain attacks (trunk only)

Browse Source 
Fix a couple of problems From a bug report.  Eating a Rider corpse is fatal, but eating a live Rider's
brain was not--now it will be, both for monster mind flayers and for player
poly'd into one.  Also, there was no check for cannibalism when poly'd hero
eats brains--now there is.  Not mentioned in the report:  eating Medusa's
brains will now be fatal just like eating her corpse.  And pet mind flayers
who eat the hero's brains will gain some nutrition like they do when eating
monster brains.

     Creating a common eat_brains() routine turned out to be something of
a mistake; there is only a tiny amount of overlap among the u-vs-m, m-vs-u,
and m-vs-m cases.

     Makefiles need a dependency update to add edog.h for eat.c.
This commit is contained in:
nethack.rankin
2005-10-01 05:14:19 +00:00
parent be193d27b5
commit f1fe8c1600
6 changed files with 161 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/uhitm.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)uhitm.c 3.5 2005/06/21 */
/* SCCS Id: @(#)uhitm.c 3.5 2005/09/27 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1307,8 +1307,7 @@ register struct monst *mdef;
register struct attack *mattk;
{
register struct permonst *pd = mdef->data;
register int tmp = d((int)mattk->damn, (int)mattk->damd);
int armpro;
int armpro, tmp = d((int)mattk->damn, (int)mattk->damd);
boolean negated;
armpro = magic_negation(mdef);
@@ -1568,29 +1567,7 @@ register struct attack *mattk;
break;
}
You("eat %s brain!", s_suffix(mon_nam(mdef)));
u.uconduct.food++;
if (touch_petrifies(mdef->data) && !Stone_resistance && !Stoned) {
make_stoned(5L, (char *)0,
KILLED_BY_AN, mdef->data->mname);
}
if (!vegan(mdef->data))
u.uconduct.unvegan++;
if (!vegetarian(mdef->data))
violated_vegetarian();
if (mindless(mdef->data)) {
pline("%s doesn't notice.", Monnam(mdef));
break;
}
tmp += rnd(10);
morehungry(-rnd(30)); /* cannot choke */
if (ABASE(A_INT) < AMAX(A_INT)) {
ABASE(A_INT) += rnd(4);
if (ABASE(A_INT) > AMAX(A_INT))
ABASE(A_INT) = AMAX(A_INT);
context.botl = 1;
}
exercise(A_WIS, TRUE);
(void) eat_brains(&youmonst, mdef, TRUE, &tmp);
break;
}
case AD_STCK: