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

Define engulfing_u, making clearer code

Browse Source
This commit is contained in:
Pasi Kallinen
2021-12-31 21:12:12 +02:00
parent 776064933a
commit 8db18275a6
16 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/artifact.c
View File

@@ -1147,7 +1147,7 @@ artifact_hit(struct monst *magr, struct monst *mdef, struct obj *otmp,
boolean youdefend = (mdef == &g.youmonst);
boolean vis = (!youattack && magr && cansee(magr->mx, magr->my))
|| (!youdefend && cansee(mdef->mx, mdef->my))
|| (youattack && u.uswallow && mdef == u.ustuck && !Blind);
|| (youattack && engulfing_u(mdef) && !Blind);
boolean realizes_damage;
const char *wepdesc;
static const char you[] = "you";
@@ -1241,7 +1241,7 @@ artifact_hit(struct monst *magr, struct monst *mdef, struct obj *otmp,
if (otmp->oartifact == ART_TSURUGI_OF_MURAMASA && dieroll == 1) {
wepdesc = "The razor-sharp blade";
/* not really beheading, but so close, why add another SPFX */
if (youattack && u.uswallow && mdef == u.ustuck) {
if (youattack && engulfing_u(mdef)) {
You("slice %s wide open!", mon_nam(mdef));
*dmgptr = 2 * mdef->mhp + FATAL_DAMAGE_MODIFIER;
return TRUE;
@@ -1287,7 +1287,7 @@ artifact_hit(struct monst *magr, struct monst *mdef, struct obj *otmp,
static const char *const behead_msg[2] = { "%s beheads %s!",
"%s decapitates %s!" };
if (youattack && u.uswallow && mdef == u.ustuck)
if (youattack && engulfing_u(mdef))
return FALSE;
wepdesc = artilist[ART_VORPAL_BLADE].name;
if (!youdefend) {