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

further improve additional glob interaction scenarios within a shop

Browse Source 
Scenarios:
1. shop_owned glob merging into shop_owned glob
2. player_owned glob merging into shop_owned glob
3. shop_owned glob merging into player_owned glob
4. player_owned glob merging into player_owned glob
This commit is contained in:
nhmall
2019-05-18 16:24:48 -04:00
parent a19e64e470
commit 670fc9ca34
5 changed files with 117 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/objnam.c
View File

@@ -1228,7 +1228,7 @@ unsigned doname_flags;
nochrg ? "contents" : "for sale",
globwt(obj, globbuf), price, currency(price));
else if (nochrg > 0)
Strcat(bp, " (no charge)");
Sprintf(eos(bp), " (%sno charge)", globwt(obj, globbuf));
}
if (!strncmp(prefix, "a ", 2)) {
/* save current prefix, without "a "; might be empty */
@@ -1242,7 +1242,8 @@ unsigned doname_flags;
/* show weight for items (debug tourist info)
* aum is stolen from Crawl's "Arbitrary Unit of Measure" */
if (wizard && iflags.wizweight) {
Sprintf(eos(bp), " (%d aum)", obj->owt);
if (!obj->globby) /* aum already apparent for globs */
Sprintf(eos(bp), " (%d aum)", obj->owt);
}
bp = strprepend(bp, prefix);
return bp;