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

genetic engineer attacks

Browse Source 
When a genetic engineer polymorphs someone it normally teleports away.
Also set mspec_used so that it can't polymorph someone [else] on its
next turn, it case of a no-teleport level or it happens to randomly
land adjacent to the target.
This commit is contained in:
PatR
2023-03-17 16:00:44 -07:00
parent aa83dadc1e
commit 1c24f208f3
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mhitm.c
View File

@@ -1015,6 +1015,7 @@ int
mon_poly(struct monst *magr, struct monst *mdef, int dmg)
{
static const char freaky[] = " undergoes a freakish metamorphosis";
struct permonst *oldform = mdef->data;
if (mdef == &gy.youmonst) {
if (Antimagic) {
@@ -1090,6 +1091,11 @@ mon_poly(struct monst *magr, struct monst *mdef, int dmg)
pline1(nothing_happens);
}
}
/* when a transformation has happened, can't attack again for poly
effect during next turn or two; not enforced for poly'd hero */
if (mdef->data != oldform && magr != &gy.youmonst)
magr->mspec_used += rnd(2);
return dmg;
}

6
src/mhitu.c
View File

@@ -343,10 +343,12 @@ getmattk(struct monst *magr, struct monst *mdef,
}
/* holders/engulfers who release the hero have mspec_used set to rnd(2)
and can't re-hold/re-engulf until it has been decremented to zero */
and can't re-hold/re-engulf until it has been decremented to zero;
likewise for transformation by genetic engineer */
} else if (magr->mspec_used && (attk->aatyp == AT_ENGL
|| attk->aatyp == AT_HUGS
|| attk->adtyp == AD_STCK)) {
|| attk->adtyp == AD_STCK
|| attk->adtyp == AD_POLY)) {
boolean wimpy = (attk->damd == 0); /* lichen, violet fungus */
/* can't re-engulf or re-grab yet; switch to simpler attack */

3
src/uhitm.c
View File

@@ -3455,7 +3455,8 @@ mhitm_ad_poly(
struct monst *magr, struct attack *mattk,
struct monst *mdef, struct mhitm_data *mhm)
{
boolean negated = mhitm_mgc_atk_negated(magr, mdef, FALSE);
boolean negated = (mhitm_mgc_atk_negated(magr, mdef, FALSE)
|| magr->mspec_used);
if (magr == &gy.youmonst) {
/* uhitm */