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

leashed food ration fix

Browse Source 
Noticed while testing an earlier fix - after your pet consumes a large mimic
corpse don't have it remain leashed once it begins to mimic something
that isn't leashable
This commit is contained in:
nhmall
2025-02-13 00:18:39 -05:00
parent a68bc3b3fb
commit e26102f66d
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/dogmove.c
View File

@@ -21,6 +21,7 @@ staticfn struct monst *best_target(struct monst *, boolean);
staticfn long score_targ(struct monst *, struct monst *); staticfn long score_targ(struct monst *, struct monst *);
staticfn boolean can_reach_location(struct monst *, coordxy, coordxy, coordxy, staticfn boolean can_reach_location(struct monst *, coordxy, coordxy, coordxy,
coordxy) NONNULLARG1; coordxy) NONNULLARG1;
staticfn boolean mnum_leashable(int);
/* pick a carried item for pet to drop */ /* pick a carried item for pet to drop */
struct obj * struct obj *
@@ -1449,10 +1450,23 @@ finish_meating(struct monst *mtmp)
} }
} }
/*
* variation of leashable() that takes a PM_ index */
staticfn boolean
mnum_leashable(int mnum)
{
return ((mnum >= LOW_PM && mnum <= HIGH_PM)
&& mnum != PM_LONG_WORM && !unsolid(&mons[mnum])
&& (!nolimbs(&mons[mnum]) || has_head(&mons[mnum])))
? TRUE
: FALSE;
}
void void
quickmimic(struct monst *mtmp) quickmimic(struct monst *mtmp)
{ {
int idx = 0, trycnt = 5, spotted, seeloc; int idx = 0, trycnt = 5, spotted, seeloc;
boolean was_leashed = mtmp->mleashed;
char buf[BUFSZ]; char buf[BUFSZ];
if (Protection_from_shape_changers || !mtmp->meating) if (Protection_from_shape_changers || !mtmp->meating)
@@ -1502,6 +1516,12 @@ quickmimic(struct monst *mtmp)
: something; : something;
newsym(mtmp->mx, mtmp->my); newsym(mtmp->mx, mtmp->my);
if (was_leashed
&& (M_AP_TYPE(mtmp) != M_AP_MONSTER
|| !mnum_leashable(mtmp->mappearance))) {
Your("leash goes slack.");
m_unleash(mtmp, FALSE);
}
if (glyph_at(mtmp->mx, mtmp->my) != prev_glyph) if (glyph_at(mtmp->mx, mtmp->my) != prev_glyph)
You("%s %s %s where %s was!", You("%s %s %s where %s was!",
seeloc ? "see" : "sense that", seeloc ? "see" : "sense that",