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

opening magic vs holding monster

Browse Source 
Zapping wand of opening or spell of knock at engulfer while swallowed
would make the engulfer expel the hero; this change makes zapping
other holders release their hold.  Zapping self now achieves the same
effect, as does breaking a non-empty wand of opening.  When poly'd
hero is holding a monster rather than being held, that monster will
be released.

Engulfers can't re-engulf for 1 or 2 turns after releasing the hero
in order to prevent hero from being immediately re-engulfed.  Impose
the same limitation on other holders.
This commit is contained in:
PatR
2021-04-13 13:51:57 -07:00
parent 8bd08ebb71
commit 5d6ab55372
7 changed files with 88 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mhitu.c
View File

@@ -298,8 +298,14 @@ getmattk(struct monst *magr, struct monst *mdef,
/* note: 3d9 is slightly higher than previous 4d6 */
}
} else if (attk->aatyp == AT_ENGL && magr->mspec_used) {
/* can't re-engulf yet; switch to simpler attack */
/* 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 */
} else if (magr->mspec_used && (attk->aatyp == AT_ENGL
|| attk->aatyp == AT_HUGS
|| attk->adtyp == AD_STCK)) {
boolean wimpy = (attk->damd == 0); /* lichen, violet fungus */
/* can't re-engulf or re-grab yet; switch to simpler attack */
*alt_attk_buf = *attk;
attk = alt_attk_buf;
if (attk->adtyp == AD_ACID || attk->adtyp == AD_ELEC
@@ -311,6 +317,10 @@ getmattk(struct monst *magr, struct monst *mdef,
}
attk->damn = 1; /* relatively weak: 1d6 */
attk->damd = 6;
if (wimpy && attk->aatyp == AT_CLAW) {
attk->aatyp = AT_TUCH;
attk->damn = attk->damd = 0;
}
/* barrow wight, Nazgul, erinys have weapon attack for non-physical
damage; force physical damage if attacker has been cancelled or