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

Redo my clobbered commit

Browse Source
This commit is contained in:
Pasi Kallinen
2023-12-09 16:06:07 +02:00
parent 9529e3f592
commit 2996e42b79
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shk.c
+9 -4
View File
@@ -1442,7 +1442,7 @@ dopay(void)
struct monst *nxtm, *resident; struct monst *nxtm, *resident;
long ltmp; long ltmp;
long umoney; long umoney;
int pass, tmp, sk = 0, seensk = 0; int pass, tmp, sk = 0, seensk = 0, nexttosk = 0;
boolean paid = FALSE, stashed_gold = (hidden_gold(TRUE) > 0L); boolean paid = FALSE, stashed_gold = (hidden_gold(TRUE) > 0L);
gm.multi = 0; gm.multi = 0;
@@ -1454,16 +1454,21 @@ dopay(void)
for (shkp = next_shkp(fmon, FALSE); shkp; for (shkp = next_shkp(fmon, FALSE); shkp;
shkp = next_shkp(shkp->nmon, FALSE)) { shkp = next_shkp(shkp->nmon, FALSE)) {
sk++; sk++;
if (ANGRY(shkp) && next2u(shkp->mx, shkp->my)) if (next2u(shkp->mx, shkp->my)) {
/* next to an irate shopkeeper? prioritize that */
if (nxtm && ANGRY(nxtm))
continue;
nexttosk++;
nxtm = shkp; nxtm = shkp;
}
if (canspotmon(shkp)) if (canspotmon(shkp))
seensk++; seensk++;
if (inhishop(shkp) && (*u.ushops == ESHK(shkp)->shoproom)) if (inhishop(shkp) && (*u.ushops == ESHK(shkp)->shoproom))
resident = shkp; resident = shkp;
} }
if (nxtm) { /* Player should always appease an */ if (nxtm && nexttosk == 1) {
shkp = nxtm; /* irate shk standing next to them. */ shkp = nxtm;
goto proceed; goto proceed;
} }