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

github PR #896 - show contained gold for ^X

Browse Source 
Pull request from entrez:  the '$' command got changed to show gold
in containers as well as gold in inventory.  Make ^X do the same.

Closes #896
This commit is contained in:
PatR
2022-10-12 16:28:13 -07:00
parent c2894a422b 9bf9aca4a9
commit e5a99e8ad8
2 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/insight.c
View File

@@ -718,17 +718,25 @@ basics_enlightenment(int mode UNUSED, int final)
(u.uac < 0) ? "best" : "worst");
enl_msg("Your armor class ", "is ", "was ", buf, "");
/* gold; similar to doprgold(#seegold) but without shop billing info;
same amount as shown on status line which ignores container contents */
/* gold; similar to doprgold (#showgold) but without shop billing info;
includes container contents, unlike status line but like doprgold */
{
static const char Your_wallet[] = "Your wallet ";
long umoney = money_cnt(g.invent);
long umoney = money_cnt(g.invent), hmoney = hidden_gold(final);
if (!umoney) {
enl_msg(Your_wallet, "is ", "was ", "empty", "");
Sprintf(buf, " Your wallet %s empty", !final ? "is" : "was");
} else {
Sprintf(buf, "%ld %s", umoney, currency(umoney));
enl_msg(Your_wallet, "contains ", "contained ", buf, "");
Sprintf(buf, " Your wallet contain%s %ld %s", !final ? "s" : "ed",
umoney, currency(umoney));
}
Strcat(buf, hmoney ? "," : ".");
enlght_out(buf);
if (hmoney) {
Sprintf(buf, "%ld %s stashed away in your pack",
hmoney, umoney ? "more" : currency(hmoney));
enl_msg(umoney ? "and you " : "but you ", "have ", "had ", buf,
"");
}
}

29
src/invent.c
View File

@@ -4496,20 +4496,21 @@ doprgold(void)
long hmoney = hidden_gold(FALSE);
if (Verbose(1, doprgold)) {
if (!umoney && !hmoney)
Your("wallet is empty.");
else if (umoney && !hmoney)
Your("wallet contains %ld %s.", umoney, currency(umoney));
else if (!umoney && hmoney)
Your("wallet is empty, but there %s %ld %s stashed away in "
"your pack.",
(hmoney == 1) ? "is" : "are",
hmoney, currency(hmoney));
else if (umoney && hmoney)
Your("wallet contains %ld %s, and there %s %ld more stashed "
"away in your pack.", umoney, currency(umoney),
(hmoney == 1) ? "is" : "are",
hmoney);
char buf[BUFSZ];
if (!umoney) {
Strcpy(buf, "Your wallet is empty");
} else {
Sprintf(buf, "Your wallet contains %ld %s",
umoney, currency(umoney));
}
if (hmoney) {
Sprintf(eos(buf),
", %s you have %ld %s stashed away in your pack",
umoney ? "and" : "but", hmoney,
umoney ? "more" : currency(hmoney));
}
pline("%s.", buf);
} else {
long total = umoney + hmoney;
if (total)