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

unpaid object: sanity check, teleporting, 'I u'

Browse Source 
It turns out that there are some objects marked unpaid that aren't
carried by the hero, so the recent sanity check for unpaid/no_charge
could complain.  Unpaid items dropped on the shop boundary (gap in
shop wall, doorway, shk's free spot) stayed unpaid when dropped onto
the floor, similar to recent change for pushed shop-owned boulders.
Don't give sanity complaints for those.  They could be all the way
inside a shop too, where unpaid items in a gap in the shop wall got
pushed into the shop when the wall was repaired.  (Possibly those
should come off the bill instead of remaining unpaid.)

Teleporting items out of a shop was marking them unpaid instead of
treating that as robbery.  That's a bug caught by the sanity check.
rloco() was also marking shop items which got teleported from one
spot inside the shop to another spot inside the same shop as unpaid.
Fix both of those things.  Also, if an unpaid item on the boundary
gets teleported all the way inside, take it off the bill.

Change 'I u' to mention whether there are additional unpaid items on
the floor somewhere since they won't be part of unpaid inventory and
they're not on the used-up bill either.  It might occasionally help
the player figure out why the shopkeeper won't let the hero out of
the shop.
This commit is contained in:
PatR
2022-11-29 13:55:42 -08:00
parent 8836b32128
commit e64ed2859d
6 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/invent.c
View File

@@ -30,7 +30,7 @@ static char display_pickinv(const char *, const char *, const char *,
boolean, long *);
static char display_used_invlets(char);
static boolean this_type_only(struct obj *);
static void dounpaid(void);
static void dounpaid(int);
static struct obj *find_unpaid(struct obj *, struct obj **);
static void menu_identify(int);
static boolean tool_being_used(struct obj *);
@@ -3732,7 +3732,7 @@ count_contents(
}
static void
dounpaid(void)
dounpaid(int floorcount)
{
winid win;
struct obj *otmp, *marker, *contnr;
@@ -3744,7 +3744,7 @@ dounpaid(void)
count = count_unpaid(g.invent);
otmp = marker = contnr = (struct obj *) 0;
if (count == 1) {
if (count == 1 && !floorcount) {
otmp = find_unpaid(g.invent, &marker);
contnr = unknwn_contnr_contents(otmp);
}
@@ -3825,10 +3825,30 @@ dounpaid(void)
}
}
putstr(win, 0, "");
putstr(win, 0,
xprname((struct obj *) 0, "Total:", '*', FALSE, totcost, 0L));
display_nhwindow(win, FALSE);
if (count > 0) {
putstr(win, 0, "");
putstr(win, 0,
xprname((struct obj *) 0, "Total:", '*', FALSE, totcost, 0L));
}
if (floorcount > 0) {
char buf[BUFSZ];
const char *floorverb = (floorcount > 1) ? "are" : "is";
if (!count) {
You(
"aren't carrying any unpaid items but there %s %d on the floor.",
floorverb, floorcount);
} else {
putstr(win, 0, "");
Sprintf(buf, "(There %s %d more unpaid object%s on the floor.)",
floorverb, floorcount, plur(floorcount));
putstr(win, 0, buf);
}
}
if (count > 0)
display_nhwindow(win, FALSE);
destroy_nhwindow(win);
}
@@ -3989,8 +4009,10 @@ dotypeinv(void)
goto doI_done;
}
if (c == 'u' || (c == 'U' && unpaid_count && !ucnt)) {
if (unpaid_count)
dounpaid();
int floorcount = count_unpaid(fobj);
if (unpaid_count || floorcount)
dounpaid(floorcount);
else
You("are not carrying any unpaid objects.");
goto doI_done;