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

Unify ad_famn

Browse Source
This commit is contained in:
Pasi Kallinen
2020-11-30 23:05:01 +02:00
parent 618feabd88
commit cb55d7c30f
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/extern.h
View File

@@ -2780,6 +2780,7 @@ E void FDECL(mhitm_ad_ench, (struct monst *, struct attack *, struct monst *, st
E void FDECL(mhitm_ad_slow, (struct monst *, struct attack *, struct monst *, struct mhitm_data *)); E void FDECL(mhitm_ad_slow, (struct monst *, struct attack *, struct monst *, struct mhitm_data *));
E void FDECL(mhitm_ad_conf, (struct monst *, struct attack *, struct monst *, struct mhitm_data *)); E void FDECL(mhitm_ad_conf, (struct monst *, struct attack *, struct monst *, struct mhitm_data *));
E void FDECL(mhitm_ad_poly, (struct monst *, struct attack *, struct monst *, struct mhitm_data *)); E void FDECL(mhitm_ad_poly, (struct monst *, struct attack *, struct monst *, struct mhitm_data *));
E void FDECL(mhitm_ad_famn, (struct monst *, struct attack *, struct monst *, struct mhitm_data *));
E int FDECL(damageum, (struct monst *, struct attack *, int)); E int FDECL(damageum, (struct monst *, struct attack *, int));
E void FDECL(missum, (struct monst *, struct attack *, BOOLEAN_P)); E void FDECL(missum, (struct monst *, struct attack *, BOOLEAN_P));
E int FDECL(passive, (struct monst *, struct obj *, BOOLEAN_P, int, E int FDECL(passive, (struct monst *, struct obj *, BOOLEAN_P, int,

8
src/mhitu.c
View File

@@ -1463,11 +1463,9 @@ register struct attack *mattk;
(void) diseasemu(mdat); /* plus the normal damage */ (void) diseasemu(mdat); /* plus the normal damage */
break; break;
case AD_FAMN: case AD_FAMN:
pline("%s reaches out, and your body shrivels.", Monnam(mtmp)); mhitm_ad_famn(mtmp, mattk, &g.youmonst, &mhm);
exercise(A_CON, FALSE); if (mhm.done)
if (!is_fainted()) return mhm.hitflags;
morehungry(rn1(40, 40));
/* plus the normal damage */
break; break;
case AD_SLIM: case AD_SLIM:
mhitm_ad_slim(mtmp, mattk, &g.youmonst, &mhm); mhitm_ad_slim(mtmp, mattk, &g.youmonst, &mhm);

25
src/uhitm.c
View File

@@ -3216,6 +3216,31 @@ struct mhitm_data *mhm;
} }
} }
void
mhitm_ad_famn(magr, mattk, mdef, mhm)
struct monst *magr;
struct attack *mattk;
struct monst *mdef;
struct mhitm_data *mhm;
{
struct permonst *pd = mdef->data;
if (magr == &g.youmonst) {
/* uhitm */
mhm->damage = 0;
} else if (mdef == &g.youmonst) {
/* mhitu */
pline("%s reaches out, and your body shrivels.", Monnam(magr));
exercise(A_CON, FALSE);
if (!is_fainted())
morehungry(rn1(40, 40));
/* plus the normal damage */
} else {
/* mhitm */
mhm->damage = 0;
}
}
/* Template for monster hits monster for AD_FOO. /* Template for monster hits monster for AD_FOO.
- replace "break" with return - replace "break" with return
- replace "return" with mhm->done = TRUE - replace "return" with mhm->done = TRUE